zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject [04/16] zeppelin git commit: ZEPPELIN-2619. Save note in ${notename_noteid}.zpln instead of ${noteid}/note.json
Date Thu, 20 Sep 2018 02:42:47 GMT
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
index 689b7af..b003dd3 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
@@ -167,7 +167,10 @@ public abstract class AbstractTestRestApi {
     }
   };
 
-  private static void start(boolean withAuth, String testClassName, boolean withKnox)
+  private static void start(boolean withAuth,
+                            String testClassName,
+                            boolean withKnox,
+                            boolean cleanData)
           throws Exception {
     LOG.info("Starting ZeppelinServer withAuth: {}, testClassName: {}, withKnox: {}",
         withAuth, testClassName, withKnox);
@@ -189,6 +192,9 @@ public abstract class AbstractTestRestApi {
           ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_GROUP_DEFAULT.getVarName(),
           "spark");
       notebookDir = new File(zeppelinHome.getAbsolutePath() + "/notebook_" + testClassName);
+      if (cleanData) {
+        FileUtils.deleteDirectory(notebookDir);
+      }
       System.setProperty(
           ZeppelinConfiguration.ConfVars.ZEPPELIN_NOTEBOOK_DIR.getVarName(),
           notebookDir.getPath()
@@ -245,15 +251,19 @@ public abstract class AbstractTestRestApi {
   }
 
   protected static void startUpWithKnoxEnable(String testClassName) throws Exception {
-    start(true, testClassName, true);
+    start(true, testClassName, true, true);
   }
   
   protected static void startUpWithAuthenticationEnable(String testClassName) throws Exception {
-    start(true, testClassName, false);
+    start(true, testClassName, false, true);
   }
   
   protected static void startUp(String testClassName) throws Exception {
-    start(false, testClassName, false);
+    start(false, testClassName, false, true);
+  }
+
+  protected static void startUp(String testClassName, boolean cleanData) throws Exception {
+    start(false, testClassName, false, cleanData);
   }
 
   private static String getHostname() {

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java
index 0b3bc23..75845d4 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java
@@ -232,10 +232,9 @@ public class InterpreterRestApiTest extends AbstractTestRestApi {
     post.releaseConnection();
   }
 
-  @Test
   public void testInterpreterRestart() throws IOException, InterruptedException {
     // when: create new note
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
     Paragraph p = note.getLastParagraph();
     Map config = p.getConfig();
@@ -282,7 +281,7 @@ public class InterpreterRestApiTest extends AbstractTestRestApi {
   @Test
   public void testRestartInterpreterPerNote() throws IOException, InterruptedException {
     // when: create new note
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
     Paragraph p = note.getLastParagraph();
     Map config = p.getConfig();

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java
index b8eccfe..2fcee08 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java
@@ -72,7 +72,7 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testGetNoteParagraphJobStatus() throws IOException {
-    Note note1 = ZeppelinServer.notebook.createNote(anonymous);
+    Note note1 = ZeppelinServer.notebook.createNote("note1", anonymous);
     note1.addNewParagraph(AuthenticationInfo.ANONYMOUS);
 
     String paragraphId = note1.getLastParagraph().getId();
@@ -93,7 +93,7 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testRunParagraphJob() throws IOException {
-    Note note1 = ZeppelinServer.notebook.createNote(anonymous);
+    Note note1 = ZeppelinServer.notebook.createNote("note1", anonymous);
     note1.addNewParagraph(AuthenticationInfo.ANONYMOUS);
 
     Paragraph p = note1.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -123,7 +123,7 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testRunAllParagraph_AllSuccess() throws IOException {
-    Note note1 = ZeppelinServer.notebook.createNote(anonymous);
+    Note note1 = ZeppelinServer.notebook.createNote("note1", anonymous);
     // 2 paragraphs
     // P1:
     //    %python
@@ -150,11 +150,13 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
     assertEquals(Job.Status.FINISHED, p1.getStatus());
     assertEquals(Job.Status.FINISHED, p2.getStatus());
     assertEquals("abc\n", p2.getReturn().message().get(0).getData());
+    //cleanup
+    ZeppelinServer.notebook.removeNote(note1.getId(), anonymous);
   }
 
   @Test
   public void testRunAllParagraph_FirstFailed() throws IOException {
-    Note note1 = ZeppelinServer.notebook.createNote(anonymous);
+    Note note1 = ZeppelinServer.notebook.createNote("note1", anonymous);
     // 2 paragraphs
     // P1:
     //    %python
@@ -181,11 +183,14 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
     assertEquals(Job.Status.ERROR, p1.getStatus());
     // p2 will be skipped because p1 is failed.
     assertEquals(Job.Status.READY, p2.getStatus());
+
+    //cleanup
+    ZeppelinServer.notebook.removeNote(note1.getId(), anonymous);
   }
 
   @Test
   public void testCloneNote() throws IOException {
-    Note note1 = ZeppelinServer.notebook.createNote(anonymous);
+    Note note1 = ZeppelinServer.notebook.createNote("note1", anonymous);
     PostMethod post = httpPost("/notebook/" + note1.getId(), "");
     LOG.info("testCloneNote response\n" + post.getResponseBodyAsString());
     assertThat(post, isAllowed());
@@ -200,7 +205,7 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
             new TypeToken<Map<String, Object>>() {}.getType());
     Map<String, Object> resp2Body = (Map<String, Object>) resp2.get("body");
 
-    assertEquals(resp2Body.get("name"), "Note " + clonedNoteId);
+    //    assertEquals(resp2Body.get("name"), "Note " + clonedNoteId);
     get.releaseConnection();
 
     //cleanup
@@ -210,7 +215,9 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testRenameNote() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    String oldName = "old_name";
+    Note note = ZeppelinServer.notebook.createNote(oldName, anonymous);
+    assertEquals(note.getName(), oldName);
     String noteId = note.getId();
 
     final String newName = "testName";
@@ -228,7 +235,7 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testUpdateParagraphConfig() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     String noteId = note.getId();
     Paragraph p = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
     assertNull(p.getConfig().get("colWidth"));
@@ -256,7 +263,7 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
   @Test
   public void testClearAllParagraphOutput() throws IOException {
     // Create note and set result explicitly
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p1 = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
     InterpreterResult result = new InterpreterResult(InterpreterResult.Code.SUCCESS,
             InterpreterResult.Type.TEXT, "result");
@@ -293,7 +300,7 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testRunWithServerRestart() throws Exception {
-    Note note1 = ZeppelinServer.notebook.createNote(anonymous);
+    Note note1 = ZeppelinServer.notebook.createNote("note1", anonymous);
     // 2 paragraphs
     // P1:
     //    %python
@@ -320,7 +327,7 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
 
     // restart server (while keeping interpreter configuration)
     AbstractTestRestApi.shutDown(false);
-    startUp(NotebookRestApiTest.class.getSimpleName());
+    startUp(NotebookRestApiTest.class.getSimpleName(), false);
 
     note1 = ZeppelinServer.notebook.getNote(note1.getId());
     p1 = note1.getParagraph(p1.getId());
@@ -337,5 +344,8 @@ public class NotebookRestApiTest extends AbstractTestRestApi {
     assertEquals(Job.Status.FINISHED, p2.getStatus());
     assertNotNull(p2.getReturn());
     assertEquals("abc\n", p2.getReturn().message().get(0).getData());
+
+    //cleanup
+    ZeppelinServer.notebook.removeNote(note1.getId(), anonymous);
   }
 }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
index 65280f8..6993418 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
@@ -90,7 +90,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   public void testGetNoteInfo() throws IOException {
     LOG.info("testGetNoteInfo");
     // Create note to get info
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     assertNotNull("can't create new note", note);
     note.setName("note");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -99,7 +99,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     paragraph.setConfig(config);
     String paragraphText = "%md This is my new paragraph in my new note";
     paragraph.setText(paragraphText);
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
 
     String sourceNoteId = note.getId();
     GetMethod get = httpGet("/notebook/" + sourceNoteId);
@@ -212,7 +212,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   public void testDeleteNote() throws IOException {
     LOG.info("testDeleteNote");
     //Create note and get ID
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testDeletedNote", anonymous);
     String noteId = note.getId();
     testDeleteNote(noteId);
   }
@@ -226,7 +226,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   @Test
   public void testExportNote() throws IOException {
     LOG.info("testExportNote");
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testExportNote", anonymous);
     assertNotNull("can't create new note", note);
     note.setName("source note for export");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -234,7 +234,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     config.put("enabled", true);
     paragraph.setConfig(config);
     paragraph.setText("%md This is my new paragraph in my new note");
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
     String sourceNoteId = note.getId();
     // Call export Note REST API
     GetMethod get = httpGet("/notebook/export/" + sourceNoteId);
@@ -258,7 +258,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     String noteName = "source note for import";
     LOG.info("testImportNote");
     // create test note
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testImportNotebook", anonymous);
     assertNotNull("can't create new note", note);
     note.setName(noteName);
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -266,10 +266,12 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     config.put("enabled", true);
     paragraph.setConfig(config);
     paragraph.setText("%md This is my new paragraph in my new note");
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
     String sourceNoteId = note.getId();
     // get note content as JSON
     String oldJson = getNoteContent(sourceNoteId);
+    // delete it first then import it
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
     // call note post
     PostMethod importPost = httpPost("/notebook/import/", oldJson);
     assertThat(importPost, isAllowed());
@@ -284,7 +286,6 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     assertEquals("Compare paragraphs count", note.getParagraphs().size(), newNote.getParagraphs()
         .size());
     // cleanup
-    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
     ZeppelinServer.notebook.removeNote(newNote.getId(), anonymous);
     importPost.releaseConnection();
   }
@@ -326,7 +327,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   public void testCloneNote() throws IOException, IllegalArgumentException {
     LOG.info("testCloneNote");
     // Create note to clone
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testCloneNote", anonymous);
     assertNotNull("can't create new note", note);
     note.setName("source note for clone");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -334,7 +335,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     config.put("enabled", true);
     paragraph.setConfig(config);
     paragraph.setText("%md This is my new paragraph in my new note");
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
     String sourceNoteId = note.getId();
 
     String noteName = "clone Note Name";
@@ -379,7 +380,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   public void testNoteJobs() throws IOException, InterruptedException {
     LOG.info("testNoteJobs");
     // Create note to run test.
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testNoteJobs", anonymous);
     assertNotNull("can't create new note", note);
     note.setName("note for run test");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -389,7 +390,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     paragraph.setConfig(config);
 
     paragraph.setText("%md This is test paragraph.");
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
     String noteId = note.getId();
 
     note.runAll();
@@ -434,7 +435,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   public void testGetNoteJob() throws IOException, InterruptedException {
     LOG.info("testGetNoteJob");
     // Create note to run test.
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testGetNoteJob", anonymous);
     assertNotNull("can't create new note", note);
     note.setName("note for run test");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -445,7 +446,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
 
     paragraph.setText("%sh sleep 1");
     paragraph.setAuthenticationInfo(anonymous);
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
     String noteId = note.getId();
 
     note.runAll();
@@ -482,7 +483,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   public void testRunParagraphWithParams() throws IOException, InterruptedException {
     LOG.info("testRunParagraphWithParams");
     // Create note to run test.
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testRunParagraphWithParams", anonymous);
     assertNotNull("can't create new note", note);
     note.setName("note for run test");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -492,7 +493,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     paragraph.setConfig(config);
 
     paragraph.setText("%spark\nval param = z.input(\"param\").toString\nprintln(param)");
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
     String noteId = note.getId();
 
     note.runAll();
@@ -517,7 +518,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   @Test
   public void testJobs() throws InterruptedException, IOException{
     // create a note and a paragraph
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testJobs", anonymous);
 
     note.setName("note for run test");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -559,7 +560,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   public void testCronDisable() throws InterruptedException, IOException{
     // create a note and a paragraph
     System.setProperty(ConfVars.ZEPPELIN_NOTEBOOK_CRON_ENABLE.getVarName(), "false");
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testCronDisable", anonymous);
 
     note.setName("note for run test");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
@@ -599,13 +600,13 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testRegressionZEPPELIN_527() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testRegressionZEPPELIN_527", anonymous);
 
     note.setName("note for run test");
     Paragraph paragraph = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
     paragraph.setText("%spark\nval param = z.input(\"param\").toString\nprintln(param)");
 
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
 
     GetMethod getNoteJobs = httpGet("/notebook/job/" + note.getId());
     assertThat("test note jobs run:", getNoteJobs, isAllowed());
@@ -621,7 +622,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testInsertParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testInsertParagraph", anonymous);
 
     String jsonRequest = "{\"title\": \"title1\", \"text\": \"text1\"}";
     PostMethod post = httpPost("/notebook/" + note.getId() + "/paragraph", jsonRequest);
@@ -679,7 +680,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testUpdateParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testUpdateParagraph", anonymous);
 
     String jsonRequest = "{\"title\": \"title1\", \"text\": \"text1\"}";
     PostMethod post = httpPost("/notebook/" + note.getId() + "/paragraph", jsonRequest);
@@ -722,12 +723,12 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testGetParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testGetParagraph", anonymous);
 
     Paragraph p = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
     p.setTitle("hello");
     p.setText("world");
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
 
     GetMethod get = httpGet("/notebook/" + note.getId() + "/paragraph/" + p.getId());
     LOG.info("testGetParagraph response\n" + get.getResponseBodyAsString());
@@ -751,7 +752,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testMoveParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testMoveParagraph", anonymous);
 
     Paragraph p = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
     p.setTitle("title1");
@@ -761,7 +762,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
     p2.setTitle("title2");
     p2.setText("text2");
 
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
 
     PostMethod post = httpPost("/notebook/" + note.getId() + "/paragraph/" + p2.getId() +
             "/move/" + 0, "");
@@ -785,13 +786,13 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
 
   @Test
   public void testDeleteParagraph() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1_testDeleteParagraph", anonymous);
 
     Paragraph p = note.addNewParagraph(AuthenticationInfo.ANONYMOUS);
     p.setTitle("title1");
     p.setText("text1");
 
-    note.persist(anonymous);
+    ZeppelinServer.notebook.saveNote(note, anonymous);
 
     DeleteMethod delete = httpDelete("/notebook/" + note.getId() + "/paragraph/" + p.getId());
     assertThat("Test delete method: ", delete, isAllowed());
@@ -805,12 +806,13 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi {
   }
 
   @Test
-  public void testTitleSearch() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+  public void testTitleSearch() throws IOException, InterruptedException {
+    Note note = ZeppelinServer.notebook.createNote("note1_testTitleSearch", anonymous);
     String jsonRequest = "{\"title\": \"testTitleSearchOfParagraph\", " +
             "\"text\": \"ThisIsToTestSearchMethodWithTitle \"}";
     PostMethod postNoteText = httpPost("/notebook/" + note.getId() + "/paragraph", jsonRequest);
     postNoteText.releaseConnection();
+    Thread.sleep(1000);
 
     GetMethod searchNote = httpGet("/notebook/search?q='testTitleSearchOfParagraph'");
     searchNote.addRequestHeader("Origin", "http://localhost");

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
index ec370d4..faa639f 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
@@ -146,7 +146,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
   @Test
   public void scalaOutputTest() throws IOException {
     // create new note
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p = note.addNewParagraph(anonymous);
     p.setText("%spark import java.util.Date\n" +
         "import java.net.URL\n" +
@@ -169,21 +169,25 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     note.run(p.getId(), true);
     assertEquals(Status.FINISHED, p.getStatus());
     assertEquals("2", p.getReturn().message().get(0).getData());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   @Test
   public void basicRDDTransformationAndActionTest() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p = note.addNewParagraph(anonymous);
     p.setText("%spark print(sc.parallelize(1 to 10).reduce(_ + _))");
     note.run(p.getId(), true);
     assertEquals(Status.FINISHED, p.getStatus());
     assertEquals("55", p.getReturn().message().get(0).getData());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   @Test
   public void sparkSQLTest() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     // test basic dataframe api
     Paragraph p = note.addNewParagraph(anonymous);
     p.setText("%spark val df=sqlContext.createDataFrame(Seq((\"hello\",20)))\n" +
@@ -212,11 +216,13 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
       assertEquals(InterpreterResult.Type.TABLE, p.getReturn().message().get(0).getType());
       assertEquals("_1\t_2\nhello\t20\n", p.getReturn().message().get(0).getData());
     }
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   @Test
   public void sparkRTest() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
 
     String sqlContextName = "sqlContext";
     if (isSpark2()) {
@@ -230,12 +236,14 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     note.run(p.getId(), true);
     assertEquals(Status.FINISHED, p.getStatus());
     assertEquals("[1] 3", p.getReturn().message().get(0).getData().trim());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   // @Test
   public void pySparkTest() throws IOException {
     // create new note
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
 
     // run markdown paragraph, again
     Paragraph p = note.addNewParagraph(anonymous);
@@ -309,12 +317,14 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
       assertTrue("[Row(len=u'3')]\n".equals(p.getReturn().message().get(0).getData()) ||
           "[Row(len='3')]\n".equals(p.getReturn().message().get(0).getData()));
     }
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   @Test
   public void zRunTest() throws IOException {
     // create new note
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p0 = note.addNewParagraph(anonymous);
     // z.run(paragraphIndex)
     p0.setText("%spark z.run(1)");
@@ -358,7 +368,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     assertEquals("END\n", p3.getReturn().message().get(0).getData());
 
     // run paragraph in note2 via paragraph in note1
-    Note note2 = ZeppelinServer.notebook.createNote(anonymous);
+    Note note2 = ZeppelinServer.notebook.createNote("note2", anonymous);
     Paragraph p20 = note2.addNewParagraph(anonymous);
     p20.setText("%spark val a = 1");
     Paragraph p21 = note2.addNewParagraph(anonymous);
@@ -378,11 +388,14 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     assertEquals(Status.FINISHED, p20.getStatus());
     assertEquals(Status.FINISHED, p21.getStatus());
     assertEquals("1", p21.getReturn().message().get(0).getData());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
+    ZeppelinServer.notebook.removeNote(note2.getId(), anonymous);
   }
 
   @Test
   public void testZeppelinContextResource() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
 
     Paragraph p1 = note.addNewParagraph(anonymous);
     p1.setText("%spark z.put(\"var_1\", \"hello world\")");
@@ -409,11 +422,13 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     assertEquals("hello world\n", p3.getReturn().message().get(0).getData());
     assertEquals(Status.FINISHED, p4.getStatus());
     assertEquals("hello world\n", p4.getReturn().message().get(0).getData());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   @Test
   public void testZeppelinContextHook() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
 
     // register global hook & note1 hook
     Paragraph p1 = note.addNewParagraph(anonymous);
@@ -433,16 +448,19 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     assertEquals(Status.FINISHED, p2.getStatus());
     assertEquals("1\n3\n5\n4\n2\n", p2.getReturn().message().get(0).getData());
 
-    Note note2 = ZeppelinServer.notebook.createNote(anonymous);
+    Note note2 = ZeppelinServer.notebook.createNote("note2", anonymous);
     Paragraph p3 = note2.addNewParagraph(anonymous);
     p3.setText("%python print(6)");
     note2.run(p3.getId(), true);
     assertEquals("1\n6\n2\n", p3.getReturn().message().get(0).getData());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
+    ZeppelinServer.notebook.removeNote(note2.getId(), anonymous);
   }
 
   @Test
   public void pySparkDepLoaderTest() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
 
     // restart spark interpreter to make dep loader work
     ZeppelinServer.notebook.getInterpreterSettingManager().close();
@@ -472,10 +490,12 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
 
     assertEquals(Status.FINISHED, p1.getStatus());
     assertEquals("2\n", p1.getReturn().message().get(0).getData());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   private void verifySparkVersionNumber() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p = note.addNewParagraph(anonymous);
 
     p.setText("%spark print(sc.version)");
@@ -483,6 +503,8 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     waitForFinish(p);
     assertEquals(Status.FINISHED, p.getStatus());
     assertEquals(sparkVersion, p.getReturn().message().get(0).getData());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   private int toIntSparkVersion(String sparkVersion) {
@@ -497,7 +519,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
 
   @Test
   public void testSparkZeppelinContextDynamicForms() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p = note.addNewParagraph(anonymous);
     String code = "%spark.spark println(z.textbox(\"my_input\", \"default_name\"))\n" +
         "println(z.password(\"my_pwd\"))\n" +
@@ -525,11 +547,13 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     assertEquals("1", result[2]);
     assertEquals("2", result[3]);
     assertEquals("items: Seq[Any] = Buffer(2)", result[4]);
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   @Test
   public void testPySparkZeppelinContextDynamicForms() throws IOException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p = note.addNewParagraph(anonymous);
     String code = "%spark.pyspark print(z.input('my_input', 'default_name'))\n" +
         "print(z.password('my_pwd'))\n" +
@@ -555,11 +579,13 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     assertEquals("None", result[1]);
     assertEquals("1", result[2]);
     assertEquals("2", result[3]);
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   @Test
   public void testAngularObjects() throws IOException, InterpreterNotFoundException {
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p1 = note.addNewParagraph(anonymous);
 
     // add local angular object
@@ -600,12 +626,14 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     globalAngularObjects = p4.getBindedInterpreter().getInterpreterGroup()
             .getAngularObjectRegistry().getAll(note.getId(), null);
     assertEquals(0, globalAngularObjects.size());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 
   @Test
   public void testConfInterpreter() throws IOException {
     ZeppelinServer.notebook.getInterpreterSettingManager().close();
-    Note note = ZeppelinServer.notebook.createNote(anonymous);
+    Note note = ZeppelinServer.notebook.createNote("note1", anonymous);
     Paragraph p = note.addNewParagraph(anonymous);
     p.setText("%spark.conf spark.jars.packages\tcom.databricks:spark-csv_2.11:1.2.0");
     note.run(p.getId(), true);
@@ -615,5 +643,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
     p1.setText("%spark\nimport com.databricks.spark.csv._");
     note.run(p1.getId(), true);
     assertEquals(Status.FINISHED, p1.getStatus());
+
+    ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
   }
 }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java
index 2ded397..0cfdcc1 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java
@@ -15,28 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.zeppelin.service;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+package org.apache.zeppelin.service;
 
 import com.google.common.collect.Maps;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import org.apache.commons.lang.StringUtils;
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.interpreter.Interpreter;
 import org.apache.zeppelin.interpreter.Interpreter.FormType;
@@ -51,6 +34,7 @@ import org.apache.zeppelin.notebook.NoteInfo;
 import org.apache.zeppelin.notebook.Notebook;
 import org.apache.zeppelin.notebook.NotebookAuthorization;
 import org.apache.zeppelin.notebook.Paragraph;
+import org.apache.zeppelin.notebook.repo.InMemoryNotebookRepo;
 import org.apache.zeppelin.notebook.repo.NotebookRepo;
 import org.apache.zeppelin.notebook.repo.NotebookRepoSettingsInfo;
 import org.apache.zeppelin.search.LuceneSearch;
@@ -60,6 +44,28 @@ import org.apache.zeppelin.user.Credentials;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 public class NotebookServiceTest {
 
   private static NotebookService notebookService;
@@ -69,47 +75,12 @@ public class NotebookServiceTest {
 
   private ServiceCallback callback = mock(ServiceCallback.class);
 
+
   @Before
   public void setUp() throws Exception {
     ZeppelinConfiguration zeppelinConfiguration = ZeppelinConfiguration.create();
-    NotebookRepo notebookRepo =
-        new NotebookRepo() {
-          Map<String, Note> notes = Maps.newHashMap();
-
-          @Override
-          public void init(ZeppelinConfiguration zConf) throws IOException {}
-
-          @Override
-          public List<NoteInfo> list(AuthenticationInfo subject) throws IOException {
-            return notes.values().stream().map(NoteInfo::new).collect(Collectors.toList());
-          }
-
-          @Override
-          public Note get(String noteId, AuthenticationInfo subject) throws IOException {
-            return notes.get(noteId);
-          }
-
-          @Override
-          public void save(Note note, AuthenticationInfo subject) throws IOException {
-            notes.put(note.getId(), note);
-          }
-
-          @Override
-          public void remove(String noteId, AuthenticationInfo subject) throws IOException {
-            notes.remove(notes.get(noteId));
-          }
-
-          @Override
-          public void close() {}
-
-          @Override
-          public List<NotebookRepoSettingsInfo> getSettings(AuthenticationInfo subject) {
-            return null;
-          }
-
-          @Override
-          public void updateSettings(Map<String, String> settings, AuthenticationInfo subject) {}
-        };
+    NotebookRepo notebookRepo = new InMemoryNotebookRepo();
+
     InterpreterSettingManager mockInterpreterSettingManager = mock(InterpreterSettingManager.class);
     InterpreterFactory mockInterpreterFactory = mock(InterpreterFactory.class);
     Interpreter mockInterpreter = mock(Interpreter.class);
@@ -151,31 +122,49 @@ public class NotebookServiceTest {
     verify(callback).onSuccess(homeNote, context);
 
     // create note
-    Note note1 = notebookService.createNote("note1", "test", context, callback);
+    Note note1 = notebookService.createNote("/folder_1/note1", "test", context, callback);
     assertEquals("note1", note1.getName());
     assertEquals(1, note1.getParagraphCount());
     verify(callback).onSuccess(note1, context);
 
     // list note
     reset(callback);
-    List<Map<String, String>> notesInfo = notebookService.listNotes(false, context, callback);
+    List<NoteInfo> notesInfo = notebookService.listNotesInfo(false, context, callback);
     assertEquals(1, notesInfo.size());
-    assertEquals(note1.getId(), notesInfo.get(0).get("id"));
-    assertEquals(note1.getName(), notesInfo.get(0).get("name"));
+    assertEquals(note1.getId(), notesInfo.get(0).getId());
+    assertEquals(note1.getName(), notesInfo.get(0).getNoteName());
     verify(callback).onSuccess(notesInfo, context);
 
     // get note
     reset(callback);
-    Note note2 = notebookService.getNote(note1.getId(), context, callback);
-    assertEquals(note1, note2);
-    verify(callback).onSuccess(note2, context);
+    Note note1_copy = notebookService.getNote(note1.getId(), context, callback);
+    assertEquals(note1, note1_copy);
+    verify(callback).onSuccess(note1_copy, context);
 
     // rename note
     reset(callback);
-    notebookService.renameNote(note1.getId(), "new_name", context, callback);
+    notebookService.renameNote(note1.getId(), "/folder_2/new_name", false, context, callback);
     verify(callback).onSuccess(note1, context);
     assertEquals("new_name", note1.getName());
 
+    // move folder
+    reset(callback);
+    notesInfo = notebookService.renameFolder("/folder_2", "/folder_3", context, callback);
+    verify(callback).onSuccess(notesInfo, context);
+    assertEquals(1, notesInfo.size());
+    assertEquals("/folder_3/new_name", notesInfo.get(0).getPath());
+
+    // create another note
+    Note note2 = notebookService.createNote("/folder_4/note2", "test", context, callback);
+    assertEquals("note2", note2.getName());
+    verify(callback).onSuccess(note2, context);
+
+    // list note
+    reset(callback);
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
+    assertEquals(2, notesInfo.size());
+    verify(callback).onSuccess(notesInfo, context);
+
     // delete note
     reset(callback);
     notebookService.removeNote(note1.getId(), context, callback);
@@ -183,22 +172,109 @@ public class NotebookServiceTest {
 
     // list note again
     reset(callback);
-    notesInfo = notebookService.listNotes(false, context, callback);
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
+    assertEquals(1, notesInfo.size());
+    verify(callback).onSuccess(notesInfo, context);
+
+    // delete folder
+    notesInfo = notebookService.removeFolder("/folder_4", context, callback);
+    verify(callback).onSuccess(notesInfo, context);
+
+    // list note again
+    reset(callback);
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
     assertEquals(0, notesInfo.size());
     verify(callback).onSuccess(notesInfo, context);
 
     // import note
     reset(callback);
-    Note importedNote = notebookService.importNote("imported note", "{}", context, callback);
+    Note importedNote = notebookService.importNote("/Imported Note", "{}", context, callback);
     assertNotNull(importedNote);
     verify(callback).onSuccess(importedNote, context);
 
     // clone note
     reset(callback);
-    Note clonedNote = notebookService.cloneNote(importedNote.getId(), "Cloned Note", context,
-        callback);
+    Note clonedNote = notebookService.cloneNote(importedNote.getId(), "/Backup/Cloned Note",
+        context, callback);
     assertEquals(importedNote.getParagraphCount(), clonedNote.getParagraphCount());
     verify(callback).onSuccess(clonedNote, context);
+
+    // list note
+    reset(callback);
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
+    assertEquals(2, notesInfo.size());
+    verify(callback).onSuccess(notesInfo, context);
+
+    // move note to Trash
+    notebookService.moveNoteToTrash(importedNote.getId(), context, callback);
+
+    reset(callback);
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
+    assertEquals(2, notesInfo.size());
+    verify(callback).onSuccess(notesInfo, context);
+
+    boolean moveToTrash = false;
+    for (NoteInfo noteInfo : notesInfo) {
+      if (noteInfo.getId().equals(importedNote.getId())) {
+        assertEquals("/~Trash/Imported Note", noteInfo.getPath());
+        moveToTrash = true;
+      }
+    }
+    assertTrue("No note is moved to trash", moveToTrash);
+
+    // restore it
+    notebookService.restoreNote(importedNote.getId(), context, callback);
+    Note restoredNote = notebookService.getNote(importedNote.getId(), context, callback);
+    assertNotNull(restoredNote);
+    assertEquals("/Imported Note", restoredNote.getPath());
+
+    // move it to Trash again
+    notebookService.moveNoteToTrash(restoredNote.getId(), context, callback);
+
+    // remove note from Trash
+    reset(callback);
+
+    notebookService.removeNote(importedNote.getId(), context, callback);
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
+    assertEquals(1, notesInfo.size());
+
+    // move folder to Trash
+    notebookService.moveFolderToTrash("Backup", context, callback);
+
+    reset(callback);
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
+    assertEquals(1, notesInfo.size());
+    verify(callback).onSuccess(notesInfo, context);
+    moveToTrash = false;
+    for (NoteInfo noteInfo : notesInfo) {
+      if (noteInfo.getId().equals(clonedNote.getId())) {
+        assertEquals("/~Trash/Backup/Cloned Note", noteInfo.getPath());
+        moveToTrash = true;
+      }
+    }
+    assertTrue("No folder is moved to trash", moveToTrash);
+
+    // restore folder
+    reset(callback);
+    notebookService.restoreFolder("/~Trash/Backup", context, callback);
+    restoredNote = notebookService.getNote(clonedNote.getId(), context, callback);
+    assertNotNull(restoredNote);
+    assertEquals("/Backup/Cloned Note", restoredNote.getPath());
+
+    // move the folder to trash again
+    notebookService.moveFolderToTrash("Backup", context, callback);
+
+    // remove folder from Trash
+    reset(callback);
+    notebookService.removeFolder("/~Trash/Backup", context, callback);
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
+    assertEquals(0, notesInfo.size());
+
+    // empty trash
+    notebookService.emptyTrash(context, callback);
+
+    notesInfo = notebookService.listNotesInfo(false, context, callback);
+    assertEquals(0, notesInfo.size());
   }
 
   @Test
@@ -245,6 +321,13 @@ public class NotebookServiceTest {
     verify(callback).onSuccess(p, context);
 
     // run paragraph synchronously via invalid code
+    //TODO(zjffdu) must sleep for a while, otherwise will get wrong status. This should be due to
+    //bug of job component.
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
     reset(callback);
     runStatus = notebookService.runParagraph(note1.getId(), p.getId(), "my_title", "invalid_code",
         new HashMap<>(), new HashMap<>(), false, true, context, callback);
@@ -259,4 +342,27 @@ public class NotebookServiceTest {
     assertNull(p.getReturn());
     verify(callback).onSuccess(p, context);
   }
+
+  @Test
+  public void testNormalizeNotePath() throws IOException {
+    assertEquals("/Untitled Note", notebookService.normalizeNotePath(" "));
+    assertEquals("/Untitled Note", notebookService.normalizeNotePath(null));
+    assertEquals("/my_note", notebookService.normalizeNotePath("my_note"));
+    assertEquals("/my  note", notebookService.normalizeNotePath("my\r\nnote"));
+
+    try {
+      String longNoteName = StringUtils.join(
+          IntStream.range(0, 256).boxed().collect(Collectors.toList()), "");
+      notebookService.normalizeNotePath(longNoteName);
+      fail("Should fail");
+    } catch (IOException e) {
+      assertEquals("Note name must be less than 255", e.getMessage());
+    }
+    try {
+      notebookService.normalizeNotePath("my..note");
+      fail("Should fail");
+    } catch (IOException e) {
+      assertEquals("Note name can not contain '..'", e.getMessage());
+    }
+  }
 }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
index c929e84..e894778 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java
@@ -40,7 +40,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.display.AngularObject;
 import org.apache.zeppelin.display.AngularObjectBuilder;
-import org.apache.zeppelin.display.AngularObjectRegistry;
 import org.apache.zeppelin.interpreter.InterpreterGroup;
 import org.apache.zeppelin.interpreter.InterpreterSetting;
 import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
@@ -60,6 +59,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+
 /** Basic REST API tests for notebookServer. */
 public class NotebookServerTest extends AbstractTestRestApi {
   private static Notebook notebook;
@@ -174,7 +174,7 @@ public class NotebookServerTest extends AbstractTestRestApi {
   public void testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent()
           throws IOException, InterruptedException {
     // create a notebook
-    Note note1 = notebook.createNote(anonymous);
+    Note note1 = notebook.createNote("note1", anonymous);
 
     // get reference to interpreterGroup
     InterpreterGroup interpreterGroup = null;
@@ -278,6 +278,8 @@ public class NotebookServerTest extends AbstractTestRestApi {
     final NotebookServer server = new NotebookServer();
     final Notebook notebook = mock(Notebook.class);
     final Note note = mock(Note.class, RETURNS_DEEP_STUBS);
+    Notebook originalNotebook = ZeppelinServer.notebook;
+    ZeppelinServer.notebook = notebook;
 
     when(notebook.getNote("noteId")).thenReturn(note);
     final Paragraph paragraph = mock(Paragraph.class, RETURNS_DEEP_STUBS);
@@ -307,59 +309,15 @@ public class NotebookServerTest extends AbstractTestRestApi {
     server.getConnectionManager().noteSocketMap.put("noteId", asList(conn, otherConn));
 
     // When
-    server.angularObjectClientBind(conn, new HashSet<String>(), notebook, messageReceived);
+    server.angularObjectClientBind(conn, messageReceived);
 
     // Then
     verify(mdRegistry, never()).addAndNotifyRemoteProcess(varName, value, "noteId", null);
 
     verify(otherConn).send(mdMsg1);
-  }
-
-  @Test
-  public void bindAngularObjectToLocalForParagraphs() throws Exception {
-    //Given
-    final String varName = "name";
-    final String value = "DuyHai DOAN";
-    final Message messageReceived = new Message(OP.ANGULAR_OBJECT_CLIENT_BIND)
-            .put("noteId", "noteId")
-            .put("name", varName)
-            .put("value", value)
-            .put("paragraphId", "paragraphId");
-
-    final NotebookServer server = new NotebookServer();
-    final Notebook notebook = mock(Notebook.class);
-    final Note note = mock(Note.class, RETURNS_DEEP_STUBS);
-    when(notebook.getNote("noteId")).thenReturn(note);
-    final Paragraph paragraph = mock(Paragraph.class, RETURNS_DEEP_STUBS);
-    when(note.getParagraph("paragraphId")).thenReturn(paragraph);
-
-    final AngularObjectRegistry mdRegistry = mock(AngularObjectRegistry.class);
-    final InterpreterGroup mdGroup = new InterpreterGroup("mdGroup");
-    mdGroup.setAngularObjectRegistry(mdRegistry);
-
-    when(paragraph.getBindedInterpreter().getInterpreterGroup()).thenReturn(mdGroup);
-
-    final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId",
-            "paragraphId");
 
-    when(mdRegistry.add(varName, value, "noteId", "paragraphId")).thenReturn(ao1);
-
-    NotebookSocket conn = mock(NotebookSocket.class);
-    NotebookSocket otherConn = mock(NotebookSocket.class);
-
-    final String mdMsg1 =  server.serializeMessage(new Message(OP.ANGULAR_OBJECT_UPDATE)
-            .put("angularObject", ao1)
-            .put("interpreterGroupId", "mdGroup")
-            .put("noteId", "noteId")
-            .put("paragraphId", "paragraphId"));
-
-    server.getConnectionManager().noteSocketMap.put("noteId", asList(conn, otherConn));
-
-    // When
-    server.angularObjectClientBind(conn, new HashSet<String>(), notebook, messageReceived);
-
-    // Then
-    verify(otherConn).send(mdMsg1);
+    // reset it to original notebook
+    ZeppelinServer.notebook = originalNotebook;
   }
 
   @Test
@@ -374,6 +332,8 @@ public class NotebookServerTest extends AbstractTestRestApi {
 
     final NotebookServer server = new NotebookServer();
     final Notebook notebook = mock(Notebook.class);
+    Notebook originalNotebook = ZeppelinServer.notebook;
+    ZeppelinServer.notebook = notebook;
     final Note note = mock(Note.class, RETURNS_DEEP_STUBS);
     when(notebook.getNote("noteId")).thenReturn(note);
     final Paragraph paragraph = mock(Paragraph.class, RETURNS_DEEP_STUBS);
@@ -400,57 +360,15 @@ public class NotebookServerTest extends AbstractTestRestApi {
     server.getConnectionManager().noteSocketMap.put("noteId", asList(conn, otherConn));
 
     // When
-    server.angularObjectClientUnbind(conn, new HashSet<String>(), notebook, messageReceived);
+    server.angularObjectClientUnbind(conn, messageReceived);
 
     // Then
     verify(mdRegistry, never()).removeAndNotifyRemoteProcess(varName, "noteId", null);
 
     verify(otherConn).send(mdMsg1);
-  }
-
-  @Test
-  public void unbindAngularObjectFromLocalForParagraphs() throws Exception {
-    //Given
-    final String varName = "name";
-    final String value = "val";
-    final Message messageReceived = new Message(OP.ANGULAR_OBJECT_CLIENT_UNBIND)
-            .put("noteId", "noteId")
-            .put("name", varName)
-            .put("paragraphId", "paragraphId");
-
-    final NotebookServer server = new NotebookServer();
-    final Notebook notebook = mock(Notebook.class);
-    final Note note = mock(Note.class, RETURNS_DEEP_STUBS);
-    when(notebook.getNote("noteId")).thenReturn(note);
-    final Paragraph paragraph = mock(Paragraph.class, RETURNS_DEEP_STUBS);
-    when(note.getParagraph("paragraphId")).thenReturn(paragraph);
-
-    final AngularObjectRegistry mdRegistry = mock(AngularObjectRegistry.class);
-    final InterpreterGroup mdGroup = new InterpreterGroup("mdGroup");
-    mdGroup.setAngularObjectRegistry(mdRegistry);
 
-    when(paragraph.getBindedInterpreter().getInterpreterGroup()).thenReturn(mdGroup);
-
-    final AngularObject<String> ao1 = AngularObjectBuilder.build(varName, value, "noteId",
-            "paragraphId");
-
-    when(mdRegistry.remove(varName, "noteId", "paragraphId")).thenReturn(ao1);
-
-    NotebookSocket conn = mock(NotebookSocket.class);
-    NotebookSocket otherConn = mock(NotebookSocket.class);
-
-    final String mdMsg1 =  server.serializeMessage(new Message(OP.ANGULAR_OBJECT_REMOVE)
-            .put("angularObject", ao1)
-            .put("interpreterGroupId", "mdGroup")
-            .put("noteId", "noteId")
-            .put("paragraphId", "paragraphId"));
-    server.getConnectionManager().noteSocketMap.put("noteId", asList(conn, otherConn));
-
-    // When
-    server.angularObjectClientUnbind(conn, new HashSet<>(), notebook, messageReceived);
-
-    // Then
-    verify(otherConn).send(mdMsg1);
+    // reset it to original notebook
+    ZeppelinServer.notebook = originalNotebook;
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-server/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/resources/log4j.properties b/zeppelin-server/src/test/resources/log4j.properties
index 2364998..9c22fdc 100644
--- a/zeppelin-server/src/test/resources/log4j.properties
+++ b/zeppelin-server/src/test/resources/log4j.properties
@@ -44,3 +44,4 @@ log4j.logger.org.hibernate.type=ALL
 log4j.logger.org.apache.hadoop=WARN
 
 log4j.logger.org.apache.zeppelin.interpreter=DEBUG
+log4j.logger.org.apache.zeppelin.scheduler=DEBUG

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-web/src/app/home/home.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/home/home.controller.js b/zeppelin-web/src/app/home/home.controller.js
index 7ae5e44..a7a8924 100644
--- a/zeppelin-web/src/app/home/home.controller.js
+++ b/zeppelin-web/src/app/home/home.controller.js
@@ -139,7 +139,7 @@ function HomeCtrl($scope, noteListFactory, websocketMsgSrv, $rootScope, arrayOrd
       return true;
     }
 
-    let noteName = note.name;
+    let noteName = note.path;
     if (noteName.toLowerCase().indexOf($scope.query.q.toLowerCase()) > -1) {
       return true;
     }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-web/src/app/notebook/notebook.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
index 27eefbc..bf4fea7 100644
--- a/zeppelin-web/src/app/notebook/notebook.controller.js
+++ b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -268,7 +268,7 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope,
       message: 'Commit note to current repository?',
       callback: function(result) {
         if (result) {
-          websocketMsgSrv.checkpointNote($routeParams.noteId, commitMessage);
+          websocketMsgSrv.checkpointNote($routeParams.noteId, $routeParams.name, commitMessage);
         }
       },
     });
@@ -283,7 +283,7 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope,
       message: 'Set notebook head to current revision?',
       callback: function(result) {
         if (result) {
-          websocketMsgSrv.setNoteRevision($routeParams.noteId, $routeParams.revisionId);
+          websocketMsgSrv.setNoteRevision($routeParams.noteId, $routeParams.name, $routeParams.revisionId);
         }
       },
     });
@@ -505,7 +505,7 @@ function NotebookCtrl($scope, $route, $routeParams, $location, $rootScope,
     const trimmedNewName = newName.trim();
     if (trimmedNewName.length > 0 && $scope.note.name !== trimmedNewName) {
       $scope.note.name = trimmedNewName;
-      websocketMsgSrv.renameNote($scope.note.id, $scope.note.name);
+      websocketMsgSrv.renameNote($scope.note.id, $scope.note.name, true);
     }
   };
 

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-web/src/components/array-ordering/array-ordering.service.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/array-ordering/array-ordering.service.js b/zeppelin-web/src/components/array-ordering/array-ordering.service.js
index 1f275e6..22f7b7a 100644
--- a/zeppelin-web/src/components/array-ordering/array-ordering.service.js
+++ b/zeppelin-web/src/components/array-ordering/array-ordering.service.js
@@ -27,10 +27,10 @@ function ArrayOrderingService(TRASH_FOLDER_ID) {
   };
 
   this.getNoteName = function(note) {
-    if (note.name === undefined || note.name.trim() === '') {
+    if (note.path === undefined || note.path.trim() === '') {
       return 'Note ' + note.id;
     } else {
-      return note.name;
+      return note.path;
     }
   };
 

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-web/src/components/note-action/note-action.service.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/note-action/note-action.service.js b/zeppelin-web/src/components/note-action/note-action.service.js
index 83cb6df..215795c 100644
--- a/zeppelin-web/src/components/note-action/note-action.service.js
+++ b/zeppelin-web/src/components/note-action/note-action.service.js
@@ -128,26 +128,26 @@ function noteActionService(websocketMsgSrv, $location, noteRenameService, noteLi
     });
   };
 
-  this.renameFolder = function(folderId) {
+  this.renameFolder = function(folderPath) {
     noteRenameService.openRenameModal({
       title: 'Rename folder',
-      oldName: folderId,
+      oldName: folderPath,
       callback: function(newName) {
-        let newFolderId = normalizeFolderId(newName);
-        if (_.has(noteListFactory.flatFolderMap, newFolderId)) {
+        let newFolderPath = normalizeFolderId(newName);
+        if (_.has(noteListFactory.flatFolderMap, newFolderPath)) {
           BootstrapDialog.confirm({
             type: BootstrapDialog.TYPE_WARNING,
             closable: true,
             title: 'WARNING! The folder will be MERGED',
-            message: 'The folder will be merged into <strong>' + _.escape(newFolderId) + '</strong>. Are you sure?',
+            message: 'The folder will be merged into <strong>' + _.escape(newFolderPath) + '</strong>. Are you sure?',
             callback: function(result) {
               if (result) {
-                websocketMsgSrv.renameFolder(folderId, newFolderId);
+                websocketMsgSrv.renameFolder(folderPath, newFolderPath);
               }
             },
           });
         } else {
-          websocketMsgSrv.renameFolder(folderId, newFolderId);
+          websocketMsgSrv.renameFolder(folderPath, newFolderPath);
         }
       },
     });

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-web/src/components/note-create/note-create.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/note-create/note-create.controller.js b/zeppelin-web/src/components/note-create/note-create.controller.js
index 95b3378..c273b85 100644
--- a/zeppelin-web/src/components/note-create/note-create.controller.js
+++ b/zeppelin-web/src/components/note-create/note-create.controller.js
@@ -56,9 +56,9 @@ function NoteCreateCtrl($scope, noteListFactory, $routeParams, websocketMsgSrv)
   vm.newNoteName = function(path) {
     let newCount = 1;
     angular.forEach(vm.notes.flatList, function(noteName) {
-      noteName = noteName.name;
-      if (noteName.match(/^Untitled Note [0-9]*$/)) {
-        let lastCount = noteName.substr(14) * 1;
+      noteName = noteName.path;
+      if (noteName.match(/^\/Untitled Note [0-9]*$/)) {
+        let lastCount = noteName.substr(15) * 1;
         if (newCount <= lastCount) {
           newCount = lastCount + 1;
         }
@@ -76,7 +76,7 @@ function NoteCreateCtrl($scope, noteListFactory, $routeParams, websocketMsgSrv)
     let regexp = new RegExp('^' + noteNamePrefix + ' .+');
 
     angular.forEach(vm.notes.flatList, function(noteName) {
-      noteName = noteName.name;
+      noteName = noteName.path;
       if (noteName.match(regexp)) {
         let lastCopyCount = noteName.substr(lastIndex).trim();
         newCloneName = noteNamePrefix;

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-web/src/components/note-list/note-list.factory.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/note-list/note-list.factory.js b/zeppelin-web/src/components/note-list/note-list.factory.js
index 59662fa..c20b854 100644
--- a/zeppelin-web/src/components/note-list/note-list.factory.js
+++ b/zeppelin-web/src/components/note-list/note-list.factory.js
@@ -25,8 +25,8 @@ function NoteListFactory(arrayOrderingSrv, TRASH_FOLDER_ID) {
     setNotes: function(notesList) {
       // a flat list to boost searching
       notes.flatList = _.map(notesList, (note) => {
-        note.isTrash = note.name
-          ? note.name.split('/')[0] === TRASH_FOLDER_ID : false;
+        note.isTrash = note.path
+          ? note.path.split('/')[0] === TRASH_FOLDER_ID : false;
         return note;
       });
 
@@ -34,8 +34,8 @@ function NoteListFactory(arrayOrderingSrv, TRASH_FOLDER_ID) {
       notes.root = {children: []};
       notes.flatFolderMap = {};
       _.reduce(notesList, function(root, note) {
-        let noteName = note.name || note.id;
-        let nodes = noteName.match(/([^\/][^\/]*)/g);
+        let notePath = note.path || note.id;
+        let nodes = notePath.match(/([^\/][^\/]*)/g);
 
         // recursively add nodes
         addNode(root, nodes, note.id);

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-web/src/components/websocket/websocket-message.service.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/websocket/websocket-message.service.js b/zeppelin-web/src/components/websocket/websocket-message.service.js
index 95eb5e9..4ece865 100644
--- a/zeppelin-web/src/components/websocket/websocket-message.service.js
+++ b/zeppelin-web/src/components/websocket/websocket-message.service.js
@@ -37,16 +37,16 @@ function WebsocketMessageService($rootScope, websocketEvents) {
       websocketEvents.sendNewEvent({op: 'MOVE_NOTE_TO_TRASH', data: {id: noteId}});
     },
 
-    moveFolderToTrash: function(folderId) {
-      websocketEvents.sendNewEvent({op: 'MOVE_FOLDER_TO_TRASH', data: {id: folderId}});
+    moveFolderToTrash: function(folderPath) {
+      websocketEvents.sendNewEvent({op: 'MOVE_FOLDER_TO_TRASH', data: {id: folderPath}});
     },
 
     restoreNote: function(noteId) {
       websocketEvents.sendNewEvent({op: 'RESTORE_NOTE', data: {id: noteId}});
     },
 
-    restoreFolder: function(folderId) {
-      websocketEvents.sendNewEvent({op: 'RESTORE_FOLDER', data: {id: folderId}});
+    restoreFolder: function(folderPath) {
+      websocketEvents.sendNewEvent({op: 'RESTORE_FOLDER', data: {id: folderPath}});
     },
 
     restoreAll: function() {
@@ -57,8 +57,8 @@ function WebsocketMessageService($rootScope, websocketEvents) {
       websocketEvents.sendNewEvent({op: 'DEL_NOTE', data: {id: noteId}});
     },
 
-    removeFolder: function(folderId) {
-      websocketEvents.sendNewEvent({op: 'REMOVE_FOLDER', data: {id: folderId}});
+    removeFolder: function(folderPath) {
+      websocketEvents.sendNewEvent({op: 'REMOVE_FOLDER', data: {id: folderPath}});
     },
 
     emptyTrash: function() {
@@ -89,12 +89,12 @@ function WebsocketMessageService($rootScope, websocketEvents) {
       websocketEvents.sendNewEvent({op: 'UPDATE_PERSONALIZED_MODE', data: {id: noteId, personalized: modeValue}});
     },
 
-    renameNote: function(noteId, noteName) {
-      websocketEvents.sendNewEvent({op: 'NOTE_RENAME', data: {id: noteId, name: noteName}});
+    renameNote: function(noteId, noteName, relative) {
+      websocketEvents.sendNewEvent({op: 'NOTE_RENAME', data: {id: noteId, name: noteName, relative: relative}});
     },
 
-    renameFolder: function(folderId, folderName) {
-      websocketEvents.sendNewEvent({op: 'FOLDER_RENAME', data: {id: folderId, name: folderName}});
+    renameFolder: function(folderId, folderPath) {
+      websocketEvents.sendNewEvent({op: 'FOLDER_RENAME', data: {id: folderId, name: folderPath}});
     },
 
     moveParagraph: function(paragraphId, newIndex) {

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-zengine/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index d37f6ea..9f0e13b 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -164,22 +164,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.reflections</groupId>
-      <artifactId>reflections</artifactId>
-      <version>${org.reflections.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
       <groupId>com.github.eirslett</groupId>
       <artifactId>frontend-maven-plugin</artifactId>
       <version>${frontend.maven.plugin.version}</version>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
index 707a230..473befb 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/helium/HeliumApplicationFactory.java
@@ -24,16 +24,18 @@ import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService;
 import org.apache.zeppelin.notebook.*;
 import org.apache.zeppelin.scheduler.ExecutorFactory;
 import org.apache.zeppelin.scheduler.Job;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 /**
  * HeliumApplicationFactory
  */
-public class HeliumApplicationFactory implements ApplicationEventListener, NotebookEventListener {
+public class HeliumApplicationFactory implements ApplicationEventListener, NoteEventListener {
   private final Logger logger = LoggerFactory.getLogger(HeliumApplicationFactory.class);
   private final ExecutorService executor;
   private Notebook notebook;
@@ -378,6 +380,7 @@ public class HeliumApplicationFactory implements ApplicationEventListener, Noteb
     }
 
     Note note = notebook.getNote(noteId);
+
     if (note == null) {
       logger.error("Can't get note {}", noteId);
       return null;
@@ -410,11 +413,16 @@ public class HeliumApplicationFactory implements ApplicationEventListener, Noteb
   }
 
   @Override
-  public void onNoteRemove(Note note) {
+  public void onNoteRemove(Note note, AuthenticationInfo subject) throws IOException {
+  }
+
+  @Override
+  public void onNoteCreate(Note note, AuthenticationInfo subject) throws IOException {
+
   }
 
   @Override
-  public void onNoteCreate(Note note) {
+  public void onNoteUpdate(Note note, AuthenticationInfo subject) throws IOException {
 
   }
 
@@ -433,6 +441,11 @@ public class HeliumApplicationFactory implements ApplicationEventListener, Noteb
   }
 
   @Override
+  public void onParagraphUpdate(Paragraph p) throws IOException {
+
+  }
+
+  @Override
   public void onParagraphStatusChange(Paragraph p, Job.Status status) {
     if (status == Job.Status.FINISHED) {
       // refresh application

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
index d730db4..8a1ccb0 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
@@ -33,16 +33,24 @@ import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
 import org.apache.zeppelin.dep.Dependency;
 import org.apache.zeppelin.dep.DependencyResolver;
+import org.apache.zeppelin.display.AngularObjectRegistry;
 import org.apache.zeppelin.display.AngularObjectRegistryListener;
 import org.apache.zeppelin.helium.ApplicationEventListener;
 import org.apache.zeppelin.interpreter.Interpreter.RegisteredInterpreter;
 import org.apache.zeppelin.interpreter.recovery.RecoveryStorage;
+import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
 import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess;
 import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcessListener;
 import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService;
+import org.apache.zeppelin.notebook.ApplicationState;
+import org.apache.zeppelin.notebook.Note;
+import org.apache.zeppelin.notebook.NoteEventListener;
+import org.apache.zeppelin.notebook.Paragraph;
 import org.apache.zeppelin.resource.Resource;
 import org.apache.zeppelin.resource.ResourcePool;
 import org.apache.zeppelin.resource.ResourceSet;
+import org.apache.zeppelin.scheduler.Job;
+import org.apache.zeppelin.user.AuthenticationInfo;
 import org.apache.zeppelin.util.ReflectionUtils;
 import org.apache.zeppelin.storage.ConfigStorage;
 import org.slf4j.Logger;
@@ -79,7 +87,8 @@ import java.util.Map;
  * (load/create/update/remove/get)
  * TODO(zjffdu) We could move it into another separated component.
  */
-public class InterpreterSettingManager implements InterpreterSettingManagerMBean {
+public class InterpreterSettingManager implements InterpreterSettingManagerMBean,
+    NoteEventListener {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(InterpreterSettingManager.class);
   private static final Map<String, Object> DEFAULT_EDITOR = ImmutableMap.of(
@@ -874,4 +883,79 @@ public class InterpreterSettingManager implements InterpreterSettingManagerMBean
     }
     return runningInterpreters;
   }
+
+  @Override
+  public void onNoteRemove(Note note, AuthenticationInfo subject) throws IOException {
+    // remove from all interpreter instance's angular object registry
+    for (InterpreterSetting settings : interpreterSettings.values()) {
+      InterpreterGroup interpreterGroup = settings.getInterpreterGroup(subject.getUser(), note.getId());
+      if (interpreterGroup != null) {
+        AngularObjectRegistry registry = interpreterGroup.getAngularObjectRegistry();
+        if (registry instanceof RemoteAngularObjectRegistry) {
+          // remove paragraph scope object
+          for (Paragraph p : note.getParagraphs()) {
+            ((RemoteAngularObjectRegistry) registry).removeAllAndNotifyRemoteProcess(note.getId(), p.getId());
+
+            // remove app scope object
+            List<ApplicationState> appStates = p.getAllApplicationStates();
+            if (appStates != null) {
+              for (ApplicationState app : appStates) {
+                ((RemoteAngularObjectRegistry) registry)
+                    .removeAllAndNotifyRemoteProcess(note.getId(), app.getId());
+              }
+            }
+          }
+          // remove note scope object
+          ((RemoteAngularObjectRegistry) registry).removeAllAndNotifyRemoteProcess(note.getId(), null);
+        } else {
+          // remove paragraph scope object
+          for (Paragraph p : note.getParagraphs()) {
+            registry.removeAll(note.getId(), p.getId());
+
+            // remove app scope object
+            List<ApplicationState> appStates = p.getAllApplicationStates();
+            if (appStates != null) {
+              for (ApplicationState app : appStates) {
+                registry.removeAll(note.getId(), app.getId());
+              }
+            }
+          }
+          // remove note scope object
+          registry.removeAll(note.getId(), null);
+        }
+      }
+    }
+
+    removeResourcesBelongsToNote(note.getId());
+  }
+
+  @Override
+  public void onNoteCreate(Note note, AuthenticationInfo subject) throws IOException {
+
+  }
+
+  @Override
+  public void onNoteUpdate(Note note, AuthenticationInfo subject) throws IOException {
+
+  }
+
+  @Override
+  public void onParagraphRemove(Paragraph p) throws IOException {
+
+  }
+
+  @Override
+  public void onParagraphCreate(Paragraph p) throws IOException {
+
+  }
+
+  @Override
+  public void onParagraphUpdate(Paragraph p) throws IOException {
+
+  }
+
+  @Override
+  public void onParagraphStatusChange(Paragraph p, Job.Status status) throws IOException {
+
+  }
 }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java
index ebec118..122848e 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FileSystemStorage.java
@@ -123,6 +123,34 @@ public class FileSystemStorage {
     });
   }
 
+  // recursive search path, (TODO zjffdu, list folder in sub folder on demand, instead of load all
+  // data when zeppelin server start)
+  public List<Path> listAll(final Path path) throws IOException {
+    return callHdfsOperation(new HdfsOperation<List<Path>>() {
+      @Override
+      public List<Path> call() throws IOException {
+        List<Path> paths = new ArrayList<>();
+        collectNoteFiles(path, paths);
+        return paths;
+      }
+
+      private void collectNoteFiles(Path folder, List<Path> noteFiles) throws IOException {
+        FileStatus[] paths = fs.listStatus(folder);
+        for (FileStatus path : paths) {
+          if (path.isDirectory()) {
+            collectNoteFiles(path.getPath(), noteFiles);
+          } else {
+            if (path.getPath().getName().endsWith(".zpln")) {
+              noteFiles.add(path.getPath());
+            } else {
+              LOGGER.warn("Unknown file: " + path.getPath());
+            }
+          }
+        }
+      }
+    });
+  }
+
   public boolean delete(final Path path) throws IOException {
     return callHdfsOperation(new HdfsOperation<Boolean>() {
       @Override
@@ -161,6 +189,13 @@ public class FileSystemStorage {
     });
   }
 
+  public void move(Path src, Path dest) throws IOException {
+    callHdfsOperation(() -> {
+      fs.rename(src, dest);
+      return null;
+    });
+  }
+
   private interface HdfsOperation<T> {
     T call() throws IOException;
   }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Folder.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Folder.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Folder.java
deleted file mode 100644
index afd5229..0000000
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Folder.java
+++ /dev/null
@@ -1,257 +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.notebook;
-
-import com.google.common.collect.Sets;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-
-/**
- * Represents a folder of Notebook. ID of the folder is a normalized path of it.
- * 'normalized path' means the path that removed '/' from the beginning and the end of the path.
- * e.g. "a/b/c", but not "/a/b/c", "a/b/c/" or "/a/b/c/".
- * One exception can be the root folder, which is '/'.
- */
-public class Folder {
-  public static final String ROOT_FOLDER_ID = "/";
-  public static final String TRASH_FOLDER_ID = "~Trash";
-  public static final String TRASH_FOLDER_CONFLICT_INFIX = " ";
-
-  private String id;
-
-  private Folder parent;
-  private Map<String, Folder> children = new LinkedHashMap<>();
-
-  // key: noteId
-  private final Map<String, Note> notes = new LinkedHashMap<>();
-
-  private List<FolderListener> listeners = new LinkedList<>();
-
-  private static final Logger logger = LoggerFactory.getLogger(Folder.class);
-
-  public Folder(String id) {
-    this.id = id;
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  public String getName() {
-    if (isRoot())
-      return ROOT_FOLDER_ID;
-
-    String path = getId();
-
-    int lastSlashIndex = path.lastIndexOf("/");
-    if (lastSlashIndex < 0) {   // This folder is under the root
-      return path;
-    }
-
-    return path.substring(lastSlashIndex + 1);
-  }
-
-  public String getParentFolderId() {
-    if (isRoot())
-      return ROOT_FOLDER_ID;
-
-    int lastSlashIndex = getId().lastIndexOf("/");
-    // The root folder
-    if (lastSlashIndex < 0) {
-      return Folder.ROOT_FOLDER_ID;
-    }
-
-    return getId().substring(0, lastSlashIndex);
-  }
-
-  public static String normalizeFolderId(String id) {
-    id = id.trim();
-    id = id.replace("\\", "/");
-    while (id.contains("///")) {
-      id = id.replaceAll("///", "/");
-    }
-    id = id.replaceAll("//", "/");
-
-    if (id.equals(ROOT_FOLDER_ID)) {
-      return ROOT_FOLDER_ID;
-    }
-
-    if (id.charAt(0) == '/') {
-      id = id.substring(1);
-    }
-    if (id.charAt(id.length() - 1) == '/') {
-      id = id.substring(0, id.length() - 1);
-    }
-
-    return id;
-  }
-
-  /**
-   * Rename this folder as well as the notes and the children belong to it
-   *
-   * @param newId
-   */
-  public void rename(String newId) {
-    if (isRoot())   // root folder cannot be renamed
-      return;
-
-    String oldId = getId();
-    id = normalizeFolderId(newId);
-    logger.info("Rename {} to {}", oldId, getId());
-
-    synchronized (notes) {
-      for (Note note : notes.values()) {
-        String noteName = note.getNameWithoutPath();
-
-        String newNotePath;
-        if (newId.equals(ROOT_FOLDER_ID)) {
-          newNotePath = noteName;
-        } else {
-          newNotePath = newId + "/" + noteName;
-        }
-        note.setName(newNotePath);
-      }
-    }
-
-    for (Folder child : children.values()) {
-      child.rename(getId() + "/" + child.getName());
-    }
-
-    notifyRenamed(oldId);
-  }
-
-  /**
-   * Merge folder's notes and child folders
-   *
-   * @param folder
-   */
-  public void merge(Folder folder) {
-    logger.info("Merge {} into {}", folder.getId(), getId());
-    addNotes(folder.getNotes());
-  }
-
-  public void addFolderListener(FolderListener listener) {
-    listeners.add(listener);
-  }
-
-  public void notifyRenamed(String oldFolderId) {
-    for (FolderListener listener : listeners) {
-      listener.onFolderRenamed(this, oldFolderId);
-    }
-  }
-
-  public Folder getParent() {
-    return parent;
-  }
-
-  public Map<String, Folder> getChildren() {
-    return children;
-  }
-
-  public void setParent(Folder parent) {
-    logger.info("Set parent of {} to {}", getId(), parent.getId());
-    this.parent = parent;
-  }
-
-  public void addChild(Folder child) {
-    if (child == this) // prevent the root folder from setting itself as child
-      return;
-    children.put(child.getId(), child);
-  }
-
-  public void removeChild(String folderId) {
-    logger.info("Remove child {} from {}", folderId, getId());
-    children.remove(folderId);
-  }
-
-  public void addNote(Note note) {
-    logger.info("Add note {} to folder {}", note.getId(), getId());
-    synchronized (notes) {
-      notes.put(note.getId(), note);
-    }
-  }
-
-  public void addNotes(List<Note> newNotes) {
-    synchronized (notes) {
-      for (Note note : newNotes) {
-        notes.put(note.getId(), note);
-      }
-    }
-  }
-
-  public void removeNote(Note note) {
-    logger.info("Remove note {} from folder {}", note.getId(), getId());
-    synchronized (notes) {
-      notes.remove(note.getId());
-    }
-  }
-
-  public List<Note> getNotes() {
-    return new LinkedList<>(notes.values());
-  }
-
-  public List<Note> getNotesRecursively() {
-    List<Note> notes = getNotes();
-
-    for (Folder child : children.values()) {
-      notes.addAll(child.getNotesRecursively());
-    }
-
-    return notes;
-  }
-
-  public List<Note> getNotesRecursively(Set<String> userAndRoles,
-      NotebookAuthorization notebookAuthorization) {
-    final Set<String> entities = Sets.newHashSet();
-    if (userAndRoles != null) {
-      entities.addAll(userAndRoles);
-    }
-
-    List<Note> notes = new ArrayList<>();
-    for (Note note : getNotes()) {
-      if (notebookAuthorization.isOwner(note.getId(), entities)) {
-        notes.add(note);
-      }
-    }
-    for (Folder child : children.values()) {
-      notes.addAll(child.getNotesRecursively(userAndRoles, notebookAuthorization));
-    }
-    return notes;
-  }
-
-  public int countNotes() {
-    return notes.size();
-  }
-
-  public boolean hasChild() {
-    return children.size() > 0;
-  }
-
-  boolean isRoot() {
-    return getId().equals(ROOT_FOLDER_ID);
-  }
-
-  public boolean isTrash() {
-    if (isRoot())
-      return false;
-
-    return getId().split("/")[0].equals(TRASH_FOLDER_ID);
-  }
-}

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/085efeb6/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FolderListener.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FolderListener.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FolderListener.java
deleted file mode 100644
index efc2f72..0000000
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/FolderListener.java
+++ /dev/null
@@ -1,24 +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.notebook;
-
-/**
- * Folder listener used by FolderView
- */
-public interface FolderListener {
-  void onFolderRenamed(Folder folder, String oldFolderId);
-}


Mime
View raw message