From 2cc6ea66856345d05ef204da833ae80c6d7b04e7 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Wed, 8 Apr 2015 19:35:51 +0900 Subject: [PATCH 1/5] Update git url --- docs/development/howtocontribute.md | 10 +++++----- docs/development/writingzeppelininterpreter.md | 12 ++++++------ docs/install/install.md | 4 ++-- index.md | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/development/howtocontribute.md b/docs/development/howtocontribute.md index 417eb5ab4d4..647a3b67f11 100644 --- a/docs/development/howtocontribute.md +++ b/docs/development/howtocontribute.md @@ -17,7 +17,7 @@ Here are some things you will need to build and test Zeppelin. #### Software Configuration Management(SCM) -Zeppelin uses Git for it's SCM system. Hosted by github.com. https://github.com/nflabs/zeppelin You'll need git client installed in your development machine. +Zeppelin uses Git for it's SCM system. Hosted by github.com. `https://github.com/apache/incubator-zeppelin` You'll need git client installed in your development machine. #### Integrated Development Environment(IDE) @@ -30,20 +30,20 @@ Oracle Java 7 Apache Maven ### Getting the source code -First of all, you need the Zeppelin source code. The official location for Zeppelin is [https://github.com/nflabs/zeppelin](https://github.com/nflabs/zeppelin) +First of all, you need the Zeppelin source code. The official location for Zeppelin is [https://github.com/apache/incubator-zeppelin](https://github.com/apache/incubator-zeppelin) #### git access Get the source code on your development machine using git. ``` -git clone https://github.com/NFLabs/zeppelin.git zeppelin +git clone https://github.com/apache/incubator-zeppelin.git zeppelin ``` You may also want to develop against a specific release. For example, for branch-0.1 ``` -git clone -b branch-0.1 https://github.com/NFLabs/zeppelin.git zeppelin +git clone -b branch-0.1 https://github.com/apache/incubator-zeppelin.git zeppelin ``` @@ -74,7 +74,7 @@ mvn install -Dspark.version=1.0.1 -Dhadoop.version=2.2.0 ``` cd zeppelin-server -HADOOP_HOME=YOUR_HADOOP_HOME JAVA_HOME=YOUR_JAVA_HOME mvn exec:java -Dexec.mainClass="com.nflabs.zeppelin.server.ZeppelinServer" -Dexec.args="" +HADOOP_HOME=YOUR_HADOOP_HOME JAVA_HOME=YOUR_JAVA_HOME mvn exec:java -Dexec.mainClass="org.apache.zeppelin.server.ZeppelinServer" -Dexec.args="" ``` or use daemon script diff --git a/docs/development/writingzeppelininterpreter.md b/docs/development/writingzeppelininterpreter.md index c4d718be11c..f4297807fe8 100644 --- a/docs/development/writingzeppelininterpreter.md +++ b/docs/development/writingzeppelininterpreter.md @@ -18,9 +18,9 @@ Interpreter can be launched either using separate classloader or separate JVM pr ### Make your own Interpreter -Creating a new interpreter is quite simple. Just extends [com.nflabs.zeppelin.interpreter](https://github.com/NFLabs/zeppelin/blob/master/zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/Interpreter.java) abstract class and implement some methods. +Creating a new interpreter is quite simple. Just extends [org.apache.zeppelin.interpreter](https://github.com/apache/incubator-zeppelin/blob/master/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java) abstract class and implement some methods. -You can include com.nflabs.zeppelin:zeppelin-interpreter:[VERSION] artifact in your build system. +You can include org.apache.zeppelin:zeppelin-interpreter:[VERSION] artifact in your build system. ### Install your interpreter binary @@ -40,7 +40,7 @@ for example, ``` zeppelin.interpreters - com.nflabs.zeppelin.spark.SparkInterpreter,com.nflabs.zeppelin.spark.SparkSqlInterpreter,com.nflabs.zeppelin.markdown.Markdown,com.nflabs.zeppelin.shell.ShellInterpreter,com.me.MyNewInterpreter + org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.shell.ShellInterpreter,com.me.MyNewInterpreter ``` @@ -63,7 +63,7 @@ println(a) Check some interpreters shipped by default. - - [spark](https://github.com/NFLabs/zeppelin/tree/master/spark) - - [markdown](https://github.com/NFLabs/zeppelin/tree/master/markdown) - - [shell](https://github.com/NFLabs/zeppelin/tree/master/shell) + - [spark](https://github.com/apache/incubator-zeppelin/tree/master/spark) + - [markdown](https://github.com/apache/incubator-zeppelin/tree/master/markdown) + - [shell](https://github.com/apache/incubator-zeppelin/tree/master/shell) diff --git a/docs/install/install.md b/docs/install/install.md index 4409ef7da59..89fb7db415a 100644 --- a/docs/install/install.md +++ b/docs/install/install.md @@ -18,7 +18,7 @@ group: install Build tested on OSX, CentOS 6. -Checkout source code from [https://github.com/NFLabs/zeppelin](https://github.com/NFLabs/zeppelin) +Checkout source code from [https://github.com/apache/incubator-zeppelin](https://github.com/apache/incubator-zeppelin) #### Local mode @@ -79,7 +79,7 @@ Configuration can be done by both environment variable(conf/zeppelin-env.sh) and ZEPPELIN_INTERPRETERS zeppelin.interpreters - spark:com.nflabs.zeppelin.spark.SparkInterpreter,
sql:com.nflabs.zeppelin.spark.SparkSqlInterpreter,
md:com.nflabs.zeppelin.markdown.Markdown,
sh:com.nflabs.zeppelin.shell.ShellInterpreter + spark:org.apache.zeppelin.spark.SparkInterpreter,
sql:org.apache.zeppelin.spark.SparkSqlInterpreter,
md:org.apache.zeppelin.markdown.Markdown,
sh:org.apache.zeppelin.shell.ShellInterpreter Comma separated interpreter configurations [Name]:[Class]. First interpreter become a default diff --git a/index.md b/index.md index ffe0e2d7f9c..d65dd743b6d 100644 --- a/index.md +++ b/index.md @@ -104,7 +104,7 @@ This way, you can easily embed it as an iframe inside of your website.


### 100% Opensource -Apache Zeppelin (incubating) is Apache2 Licensed software. Please check out the [source repository](https://github.com/NFLabs/zeppelin) and [How to contribute](./docs/development/howtocontribute.html) +Apache Zeppelin (incubating) is Apache2 Licensed software. Please check out the [source repository](https://github.com/apache/incubator-zeppelin) and [How to contribute](./docs/development/howtocontribute.html) Zeppelin has a very active development community. Join the [Mailing list](./community.html) and report issues on our [Issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN). From 36d34c6dd066b905e7da58a9545043de6278a9fd Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Wed, 8 Apr 2015 19:45:23 +0900 Subject: [PATCH 2/5] Add hive as default interpreter --- docs/development/writingzeppelininterpreter.md | 3 ++- docs/install/install.md | 2 +- index.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/development/writingzeppelininterpreter.md b/docs/development/writingzeppelininterpreter.md index f4297807fe8..61b210419bf 100644 --- a/docs/development/writingzeppelininterpreter.md +++ b/docs/development/writingzeppelininterpreter.md @@ -40,7 +40,7 @@ for example, ``` zeppelin.interpreters - org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.shell.ShellInterpreter,com.me.MyNewInterpreter + org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,com.me.MyNewInterpreter ``` @@ -66,4 +66,5 @@ Check some interpreters shipped by default. - [spark](https://github.com/apache/incubator-zeppelin/tree/master/spark) - [markdown](https://github.com/apache/incubator-zeppelin/tree/master/markdown) - [shell](https://github.com/apache/incubator-zeppelin/tree/master/shell) + - [hive](https://github.com/apache/incubator-zeppelin/tree/master/hive) diff --git a/docs/install/install.md b/docs/install/install.md index 89fb7db415a..08ad465221c 100644 --- a/docs/install/install.md +++ b/docs/install/install.md @@ -79,7 +79,7 @@ Configuration can be done by both environment variable(conf/zeppelin-env.sh) and ZEPPELIN_INTERPRETERS zeppelin.interpreters - spark:org.apache.zeppelin.spark.SparkInterpreter,
sql:org.apache.zeppelin.spark.SparkSqlInterpreter,
md:org.apache.zeppelin.markdown.Markdown,
sh:org.apache.zeppelin.shell.ShellInterpreter + spark:org.apache.zeppelin.spark.SparkInterpreter,
sql:org.apache.zeppelin.spark.SparkSqlInterpreter,
md:org.apache.zeppelin.markdown.Markdown,
sh:org.apache.zeppelin.shell.ShellInterpreter,
hive:org.apache.zeppelin.hive.HiveInterpreter Comma separated interpreter configurations [Name]:[Class]. First interpreter become a default diff --git a/index.md b/index.md index d65dd743b6d..6e57543f222 100644 --- a/index.md +++ b/index.md @@ -28,7 +28,7 @@ tagline: Less Development, More analysis! ### Multiple language backend Zeppelin interpreter concept allows any language/data-processing-backend to be plugged into Zeppelin. -Current languages included in the Zeppelin interpreter are: Scala(with Apache Spark), Python(with Apache Spark), SparkSQL, Markdown and Shell. +Current languages included in the Zeppelin interpreter are: Scala(with Apache Spark), Python(with Apache Spark), SparkSQL, Hive, Markdown and Shell. From fbb30fb64b92710b7691ce184fe3c919d08a9ab9 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Thu, 9 Apr 2015 12:08:59 +0900 Subject: [PATCH 3/5] Remove docs/current file --- docs/current | 1 - 1 file changed, 1 deletion(-) delete mode 120000 docs/current diff --git a/docs/current b/docs/current deleted file mode 120000 index 441f3a62304..00000000000 --- a/docs/current +++ /dev/null @@ -1 +0,0 @@ -zengine-api/0.2.0/ \ No newline at end of file From bb573bf5e05f5660abeffa6b1c5b6eef6e383b32 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Thu, 9 Apr 2015 12:14:31 +0900 Subject: [PATCH 4/5] Update git link on navi menu --- _includes/themes/zeppelin/_navigation.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/themes/zeppelin/_navigation.html b/_includes/themes/zeppelin/_navigation.html index ab0a45234b3..ca53595d745 100644 --- a/_includes/themes/zeppelin/_navigation.html +++ b/_includes/themes/zeppelin/_navigation.html @@ -22,7 +22,7 @@ {% assign pages_list = site.pages %} {% assign group = 'nav-right' %} {% include JB/pages_list %} -
  • GitHub
    • +
  • GitHub
  • Apache
      From 0e64951c7a67eb4988f1200bd27d08421ab45042 Mon Sep 17 00:00:00 2001 From: Mina Lee Date: Sat, 11 Apr 2015 09:54:45 +0900 Subject: [PATCH 5/5] Add pyspark and dependency loader as default interpreter --- docs/development/writingzeppelininterpreter.md | 2 +- docs/install/install.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/development/writingzeppelininterpreter.md b/docs/development/writingzeppelininterpreter.md index 61b210419bf..ed969c68b2f 100644 --- a/docs/development/writingzeppelininterpreter.md +++ b/docs/development/writingzeppelininterpreter.md @@ -40,7 +40,7 @@ for example, ``` zeppelin.interpreters - org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,com.me.MyNewInterpreter + org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,com.me.MyNewInterpreter ``` diff --git a/docs/install/install.md b/docs/install/install.md index 08ad465221c..d894581cda4 100644 --- a/docs/install/install.md +++ b/docs/install/install.md @@ -79,8 +79,8 @@ Configuration can be done by both environment variable(conf/zeppelin-env.sh) and ZEPPELIN_INTERPRETERS zeppelin.interpreters - spark:org.apache.zeppelin.spark.SparkInterpreter,
      sql:org.apache.zeppelin.spark.SparkSqlInterpreter,
      md:org.apache.zeppelin.markdown.Markdown,
      sh:org.apache.zeppelin.shell.ShellInterpreter,
      hive:org.apache.zeppelin.hive.HiveInterpreter - Comma separated interpreter configurations [Name]:[Class]. First interpreter become a default + org.apache.zeppelin.spark.SparkInterpreter,
      org.apache.zeppelin.spark.PySparkInterpreter,
      org.apache.zeppelin.spark.SparkSqlInterpreter,
      org.apache.zeppelin.spark.DepInterpreter,
      org.apache.zeppelin.markdown.Markdown,
      org.apache.zeppelin.shell.ShellInterpreter,
      org.apache.zeppelin.hive.HiveInterpreter + Comma separated interpreter configurations [Class]. First interpreter become a default ZEPPELIN_INTERPRETER_DIR