Repository: incubator-zeppelin Updated Branches: refs/heads/master 0c4614028 -> b3b9c93d9
[ZEPPELIN-41] Missing HiveInterpreter configuration at Configuration.java This PR enables to create hive interpreter by default without conf/zeppelin-site.xml Author: Mina Lee <[email protected]> Closes #37 from minahlee/add/hive_conf and squashes the following commits: 97316f4 [Mina Lee] Update RestApi test c17684a [Mina Lee] [ZEPPELIN-41] Missing HiveInterpreter configuration at Configuration.java Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/b3b9c93d Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/b3b9c93d Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/b3b9c93d Branch: refs/heads/master Commit: b3b9c93d92baff2cedfd6462a52ab1b5138035d2 Parents: 0c46140 Author: Mina Lee <[email protected]> Authored: Mon Apr 20 23:01:17 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Sat Apr 25 07:48:20 2015 +0900 ---------------------------------------------------------------------- .../test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java | 2 +- .../main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b3b9c93d/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 a3bf289..db37bf5 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 @@ -79,7 +79,7 @@ public class ZeppelinRestApiTest extends AbstractTestRestApi { assertThat(get, isAllowed()); Map<String, Object> resp = gson.fromJson(get.getResponseBodyAsString(), new TypeToken<Map<String, Object>>(){}.getType()); Map<String, Object> body = (Map<String, Object>) resp.get("body"); - assertEquals(7, body.size()); + assertEquals(8, body.size()); get.releaseConnection(); } http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b3b9c93d/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java index c6c3b82..f5c816f 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java @@ -386,7 +386,8 @@ public class ZeppelinConfiguration extends XMLConfiguration { + "org.apache.zeppelin.spark.DepInterpreter," + "org.apache.zeppelin.markdown.Markdown," + "org.apache.zeppelin.angular.AngularInterpreter," - + "org.apache.zeppelin.shell.ShellInterpreter"), + + "org.apache.zeppelin.shell.ShellInterpreter," + + "org.apache.zeppelin.hive.HiveInterpreter"), ZEPPELIN_INTERPRETER_DIR("zeppelin.interpreter.dir", "interpreter"), ZEPPELIN_ENCODING("zeppelin.encoding", "UTF-8"), ZEPPELIN_NOTEBOOK_DIR("zeppelin.notebook.dir", "notebook"),
