You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/07/20 05:39:10 UTC
[1/3] incubator-kylin git commit: KYLIN-884 update website
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging 87d316fa5 -> df020d7c7
KYLIN-884 update website
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/beb87798
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/beb87798
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/beb87798
Branch: refs/heads/0.7-staging
Commit: beb87798f77bab68b04f400003d726eebddbfe82
Parents: 99625e4
Author: Luke Han <lu...@apache.org>
Authored: Mon Jul 20 11:37:52 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Mon Jul 20 11:37:52 2015 +0800
----------------------------------------------------------------------
website/README.md | 25 ++++++++++--
website/_data/docs.yml | 1 +
website/_docs/development/build_api.md | 2 +-
website/_docs/development/dev_env.md | 6 +--
website/_docs/index.md | 30 +++++++-------
website/_docs/install/kylin_docker.md | 3 +-
.../_docs/install/manual_install_guide.cn.md | 41 +++++++-------------
website/_docs/install/manual_install_guide.md | 37 ++++++------------
website/_docs/tutorial/odbc.cn.md | 4 +-
website/_docs/tutorial/odbc.md | 4 +-
website/_docs/tutorial/tableau.md | 6 +--
website/_includes/footer.html | 15 ++++++-
website/download/index.cn.md | 5 +--
website/download/index.md | 5 +--
14 files changed, 85 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/README.md
----------------------------------------------------------------------
diff --git a/website/README.md b/website/README.md
index b6e7a63..f977b5b 100644
--- a/website/README.md
+++ b/website/README.md
@@ -21,23 +21,40 @@ limitations under the License.
This directory contains the source code for the Apache Kylin (incubating) website:
[http://kyin.incubator.apache.org](http://kylin.incubator.apache.org/).
+## Kylin website's structure:
+
+1. ___config.yml__: Jekyll settings
+2. ___layouts__: Page layout template
+3. ___includes__: Page template like header, footer...
+2. ___data__: Jekyll collections, docs.yml is for Docs menu generation
+3. ___docs__: Docuemtation folder
+4. ___posts__: Blog folder
+5. __download__: Download folder, including released source code package, binary package, ODBC Driver and development version.
+6. __cn__: Chinese version
+
+## Multi-Language
+To draft Chinese version document or translate existing one, just add or copy that doc and name with .cn.md as sufffix. It will generate under /cn folder with same name as html file.
+To add other language, please update _config.yml and follow the same pattern as Chinese version.
+
## Setup
-1. `cd docs/website`
+1. `cd website`
2. `svn co https://svn.apache.org/repos/asf/incubator/kylin/site _site`
3. `sudo apt-get install rubygems ruby2.1-dev zlib1g-dev` (linux)
4. `sudo gem install bundler github-pages jekyll`
5. `bundle install`
+___site_ folder is working dir which will be removed anytime by maven or git, please make sure only check out from svn when you want to publish to website.
+
## Running locally
Before opening a pull request or push to git repo, you can preview changes from your local box with following:
-1. `cd docs/website`
+1. `cd website`
2. `jekyll s`
-3. Open [http://localhost:4000](http://localhost:4000)
+3. Open [http://localhost:4000](http://localhost:4000) in your browser
## Pushing to site (for committer only)
-1. `cd docs/website/_site`
+1. `cd website/_site`
2. `svn status`
3. You'll need to `svn add` any new files
4. `svn commit -m 'UPDATE MESSAGE'`
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_data/docs.yml
----------------------------------------------------------------------
diff --git a/website/_data/docs.yml b/website/_data/docs.yml
index 3c67dbc..63b1fda 100644
--- a/website/_data/docs.yml
+++ b/website/_data/docs.yml
@@ -31,6 +31,7 @@
- howto/howto_javascript
- howto/howto_backup
- howto/howto_upgrade
+ - howto/howto_docs
- howto/howto_release
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/development/build_api.md
----------------------------------------------------------------------
diff --git a/website/_docs/development/build_api.md b/website/_docs/development/build_api.md
index 6f6c4ed..37b25e3 100644
--- a/website/_docs/development/build_api.md
+++ b/website/_docs/development/build_api.md
@@ -32,7 +32,7 @@ since: v0.6
{% endhighlight %}
### 3. Then submit a build job of the cube.
* `PUT http://localhost:7070/kylin/api/cubes/{cube_name}/rebuild`
-* For put request body detail please refer to [service doc](https://github.com/KylinOLAP/Kylin/wiki/Restful-Service-Doc).
+* For put request body detail please refer to [service doc](rest_api.html).
* `startTime` and `endTime` should be utc timestamp.
* `buildType` can be `BUILD` or `MERGE`. `BUILD` is for building a new segment or refreshing an existing segment. `MERGE` is for merging multiple existing segments into one bigger segment.
* This method will return a newly created job instance, in which the uuid is the identity of job to track job status.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/development/dev_env.md
----------------------------------------------------------------------
diff --git a/website/_docs/development/dev_env.md b/website/_docs/development/dev_env.md
index 4866f60..ab39419 100644
--- a/website/_docs/development/dev_env.md
+++ b/website/_docs/development/dev_env.md
@@ -7,14 +7,10 @@ version: v0.7.2
since: v0.6
---
-Off-Hadoop-CLI installation is usually for **development use**.
-
-Developers want to run kylin test cases or applications at their development machine. The scenario is depicted at [https://github.com/KylinOLAP/Kylin#off-hadoop-cli-installation](https://github.com/KylinOLAP/Kylin#off-hadoop-cli-installation).
-
+Developers want to run kylin test cases or applications at their development machine.
By following this tutorial, you will be able to build kylin test cubes by running a specific test case, and you can further run other test cases against the cubes having been built.
-
## Environment on the Hadoop CLI
Off-Hadoop-CLI installation requires you having a hadoop CLI machine (or a hadoop sandbox) as well as your local develop machine. To make things easier we strongly recommend you starting with running Kylin on a hadoop sandbox, like <http://hortonworks.com/products/hortonworks-sandbox/>. In the following tutorial we'll go with **Hortonworks Sandbox 2.2**.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/index.md
----------------------------------------------------------------------
diff --git a/website/_docs/index.md b/website/_docs/index.md
index dee95e7..6c49d04 100644
--- a/website/_docs/index.md
+++ b/website/_docs/index.md
@@ -17,36 +17,34 @@ Please follow installation & tutorial to start with Kylin.
Advanced Topics
-------
-####Connectivity
-1.[How to use kylin remote jdbc driver](docs/Tutorial/How to use kylin remote jdbc driver.md)
+###Connectivity
+1.[How to use kylin remote jdbc driver](docs/howto/howto_jdbc.html)
2.[SQL Reference](https://github.com/apache/incubator-calcite/blob/master/doc/reference.md)
-####REST
+###REST API
-1.[Kylin Restful API List](docs/REST/Kylin Restful API List.md)
+1.[Kylin Restful API List](docs/development/rest_api.html)
-2.[Build Cube with Restful API](docs/REST/Build Cube with Restful API.md)
+2.[Build Cube with Restful API](docs/development/build_api.html)
-3.[How to consume Kylin REST API in javascript](docs/REST/How to consume Kylin REST API in javascript.md)
+3.[How to consume Kylin REST API in javascript](docs/development/javascript_api.html)
-####Operations
-1.[Kylin Metadata Store](docs/Operations/Kylin Metadata Store.md)
+###Operations
+1.[Kylin Metadata Store](docs/development/new_metadata.html)
-2.[Export Kylin HBase data](docs/Operations/Export Kylin HBase data.md)
+2.[Export Kylin HBase data](docs/howto/howto_backup.html)
-3.[Advanced settings of Kylin environment](docs/Operations/Advanced settings of Kylin environment.md)
+3.[Advanced settings of Kylin environment](docs/install/advance_settings.html)
-####Test
+###Test
-1.[Run Kylin test case with HBase Mini Cluster](docs/Test/Run Kylin test case with HBase Mini Cluster.md)
+1.[Run Kylin test case with HBase Mini Cluster](docs/development/test_minicluster.html)
-####Technial Details
+###Technial Details
-1.[New meta data model structure](docs/TechInside/New meta data model structure.md)
-
-2.[Job Engine Design](docs/JobEngine/Design.md)
+1.[New meta data model structure](docs/development/new_metadata.html)
## Disclaimer
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/install/kylin_docker.md
----------------------------------------------------------------------
diff --git a/website/_docs/install/kylin_docker.md b/website/_docs/install/kylin_docker.md
index a7941f7..76f4ff6 100644
--- a/website/_docs/install/kylin_docker.md
+++ b/website/_docs/install/kylin_docker.md
@@ -41,5 +41,6 @@ Use `admin/admin` to login. Make sure HBase is running.
#Kylin Dashboard
http://<container_ip>:7070
{% endhighlight %}
-The default credentials to login are: `ADMIN:KYLIN`. The cluster is pre-populated with sample data and is ready to build cubes as shown [here](https://github.com/KylinOLAP/Kylin/wiki/Kylin-Cube-Creation-Tutorial).
+The default credentials to login are: `ADMIN:KYLIN`.
+The cluster is pre-populated with sample data and is ready to build cubes as shown [here](../tutorial/create_cube.html).
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/install/manual_install_guide.cn.md
----------------------------------------------------------------------
diff --git a/website/_docs/install/manual_install_guide.cn.md b/website/_docs/install/manual_install_guide.cn.md
index 1040d89..a6e6c6b 100644
--- a/website/_docs/install/manual_install_guide.cn.md
+++ b/website/_docs/install/manual_install_guide.cn.md
@@ -9,50 +9,35 @@ since: v0.7.1
## 引言
-在大多数情况下，我们的自动脚本[On-Hadoop-CLI-installation](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation)可以帮助你在你的hadoop sandbox甚至你的hadoop cluster中启动Kylin。但是，为防部署脚本出错，我们撰写本文作为参考指南来解决你的问题。
+在大多数情况下，我们的自动脚本[Installation Guide](./index.html)可以帮助你在你的hadoop sandbox甚至你的hadoop cluster中启动Kylin。但是，为防部署脚本出错，我们撰写本文作为参考指南来解决你的问题。
基本上本文解释了自动脚本中的每一步骤。我们假设你已经对Linux上的Hadoop操作非常熟悉。
## 前提条件
-* 已安装Tomcat，输出到CATALINA_HOME（with CATALINA_HOME exported）。([quick help](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation#install-tomcat))
-* 已安装Maven，shell可访问`mvn`指令（with `mvn` command accessible at shell）。([quick help](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation#install-maven))
-* 已安装Npm，shell可访问`npm`指令（with command `npm` accessible at shell）。([quick help](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation#install-npm))
-* Kylin git repo克隆到一个文件夹，之后使用$KYLIN_HOME引用
+* 已安装Tomcat，输出到CATALINA_HOME（with CATALINA_HOME exported).
+* Kylin 二进制文件拷贝至本地并解压，之后使用$KYLIN_HOME引用
## 步骤
-### 1.从源代码构建kylin.war
-
-我们提供一个脚本（$KYLIN_HOME/package.sh）来帮助你自动操作这个步骤。kylin.war由两部分组成：（看看package.sh可以更好地理解）
-
-* 一个REST服务器接收cube构建请求，查询请求等。这一部分是纯Java的，并由maven构建。
-* 一个基于angular（angular-based）的网页应用，这是一个用户看到的真实网站，并且它会调用上述REST服务器的REST API。这一部分是纯html+js的，并由npm构建。
-
-运行package.sh会构建上述两部分并将它们合并到单个kylin.war。
-
-### 2.自定义Kylin配置文件
-
-Kylin的配置文件包括一个kylin.properties和一个用于MR job设置的kylin_job_conf.xml。你可以在$KYLIN_HOME/examples/test_case_data/sandbox/找到这两个配置文件的模板。它们几乎可以直接使用，你唯一需要做的是将它们复制到一个配置文件夹（我们建议/etc/kylin，如果你选择不使用它，你将在之后出现"/etc/kylin"处使用你路径进行替换）并使用你服务器的实际主机名替换每个kylin.properties中的"sandbox"。
-
-当你发现你的cube的膨胀率过大，你将需要考虑通过修改kylin_job_conf.xml启用LZO压缩，查看[this chapter ](https://github.com/KylinOLAP/Kylin/wiki/Advance-settings-of-Kylin-environment#enabling-lzo-compression)探讨如何修改。测试cube（For test cubes）可以安全地忽略这一点。
-
-### 3. 准备tomcat
-* 复制 $KYLIN_HOME/server/target/kylin.war 到 $CATALINA_HOME/webapps/, 将Kylin.war的模式修改为644以防tomcat无法访问它。
-* tomcat默认使用端口8080与一些其他端口。但是，这些端口在许多hadoop sandbox中已经被占用了。例如，端口8080在hortonworks sandbox上被ambari使用。所以必要的话你需要修改端口。如果你对此不熟悉，你可以选择使用$KYLIN_HOME/deploy/server.xml覆盖$CATALINA_HOME/conf/server.xml。使用我们的server.xml，kylin会运行在端口7070.
-
-### 4. 准备Jars
+### 准备Jars
Kylin会需要使用两个jar包，两个jar包和配置在默认kylin.properties：（there two jars and configured in the default kylin.properties）
-#### kylin.job.jar=/tmp/kylin/kylin-job-latest.jar
+```
+kylin.job.jar=/tmp/kylin/kylin-job-latest.jar
+
+```
这是Kylin用于MR jobs的job jar包。你需要复制 $KYLIN_HOME/job/target/kylin-job-latest.jar 到 /tmp/kylin/
-#### kylin.coprocessor.local.jar=/tmp/kylin/kylin-coprocessor-latest.jar
+```
+kylin.coprocessor.local.jar=/tmp/kylin/kylin-coprocessor-latest.jar
+
+```
这是一个Kylin会放在hbase上的hbase协处理jar包。它用于提高性能。你需要复制 $KYLIN_HOME/storage/target/kylin-coprocessor-latest.jar 到 /tmp/kylin/
-### 5. 启动Kylin
+### 启动Kylin
以`./kylin.sh start`
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/install/manual_install_guide.md
----------------------------------------------------------------------
diff --git a/website/_docs/install/manual_install_guide.md b/website/_docs/install/manual_install_guide.md
index 5bc4261..f75ce7e 100644
--- a/website/_docs/install/manual_install_guide.md
+++ b/website/_docs/install/manual_install_guide.md
@@ -9,46 +9,31 @@ since: v0.7.1
## INTRODUCTION
-In most cases our automated script [On-Hadoop-CLI-installation](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation) can help you launch Kylin in your hadoop sandbox and even your hadoop cluster. However, in case something went wrong in the deploy script, this article comes as an reference guide to fix your issues.
+In most cases our automated script [Installation Guide](index.html) can help you launch Kylin in your hadoop sandbox and even your hadoop cluster. However, in case something went wrong in the deploy script, this article comes as an reference guide to fix your issues.
Basically this article explains every step in the automatic script. We assume that you are already very familiar with Hadoop operations on Linux.
## PREREQUISITES
-* Tomcat installed, with CATALINA_HOME exported. ([quick help](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation#install-tomcat))
-* Maven installed, with `mvn` command accessible at shell. ([quick help](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation#install-maven))
-* Npm installed, with command `npm` accessible at shell. ([quick help](https://github.com/KylinOLAP/Kylin/wiki/On-Hadoop-CLI-installation#install-npm))
-* Kylin git repo cloned to a folder later referenced as $KYLIN_HOME
+* Tomcat installed, with CATALINA_HOME exported.
+* Kylin binary pacakge copied to local and setup $KYLIN_HOME correctly
## STEPS
-### 1.Build kylin.war from source code
-
-We have provided a script( $KYLIN_HOME/package.sh ) to help you automate this step. The kylin.war composes of two parts: (Take a look at package.sh to better understand)
-
-* A REST server that accepts cube build requests, queries requests ,etc. This part is purely in Java, and is built by maven.
-* An angular-based web application, this is the real website users see, and it will call the REST APIs in the above REST server. This part is purely html+js, and is built by npm.
-
-Running package.sh will build both parts and combine them to a single kylin.war.
-
-### 2.Customize kylin configuration files
-
-Kylin's configuration file includes a kylin.properties and a kylin_job_conf.xml for MR job settings. You can find a template for these two configuration files in $KYLIN_HOME/examples/test_case_data/sandbox/. They're almost ready to use, the only thing you need to do is copy them to a configuration folder(we suggest /etc/kylin, if you choose not to use it, you'll replace the "/etc/kylin" with yours in later occurrence) and replace every "sandbox" in kylin.properties with the real hostname of your server.
-
-When you find you cubes's expansion rate too large, you'll need to consider enabling LZO compression by modifying kylin_job_conf.xml, checkout [this chapter ](https://github.com/KylinOLAP/Kylin/wiki/Advance-settings-of-Kylin-environment#enabling-lzo-compression) to find how. For test cubes you can safely ignore this.
-
-### 3. Prepare tomcat
-* Copy $KYLIN_HOME/server/target/kylin.war to $CATALINA_HOME/webapps/, change kylin.war's mode to 644 in case tomcat have no access to it.
-* By default tomcat uses port 8080 as well as several other ports. However, these ports are already occupied in many hadoop sandboxes. For example, port 8080 is used by ambari on hortonworks sandbox. So you need to modify port if necessary. If you're not familiar with this, you can choose to overwrite $CATALINA_HOME/conf/server.xml with $KYLIN_HOME/deploy/server.xml. With our server.xml, kylin will run on port 7070.
-
### 4. Prepare Jars
There are two jars that Kylin will need to use, there two jars and configured in the default kylin.properties:
-#### kylin.job.jar=/tmp/kylin/kylin-job-latest.jar
+```
+kylin.job.jar=/tmp/kylin/kylin-job-latest.jar
+
+```
This is job jar that Kylin uses for MR jobs. You need to copy $KYLIN_HOME/job/target/kylin-job-latest.jar to /tmp/kylin/
-#### kylin.coprocessor.local.jar=/tmp/kylin/kylin-coprocessor-latest.jar
+```
+kylin.coprocessor.local.jar=/tmp/kylin/kylin-coprocessor-latest.jar
+
+```
This is a hbase coprocessor jar that Kylin will put on hbase. It is used for performance boosting. You need to copy $KYLIN_HOME/storage/target/kylin-coprocessor-latest.jar to /tmp/kylin/
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/tutorial/odbc.cn.md
----------------------------------------------------------------------
diff --git a/website/_docs/tutorial/odbc.cn.md b/website/_docs/tutorial/odbc.cn.md
index 49ddab0..dc7e559 100644
--- a/website/_docs/tutorial/odbc.cn.md
+++ b/website/_docs/tutorial/odbc.cn.md
@@ -24,11 +24,11 @@ since: v0.7.1
## 安装
1. 如果你已经安装，首先卸载已存在的Kylin ODBC
-2. 从[KylinOLAP/odbc-driver/exe](https://github.com/KylinOLAP/odbc-driver/tree/master/exe)下载附件驱动安装程序，并运行。
+2. 从[下载](../../download/)下载附件驱动安装程序，并运行。
* 32位Tableau Desktop：请安装KylinODBCDriver (x86).exe
* 64位Tableau Desktop：请安装KylinODBCDriver (x64).exe
3. Both drivers already be installed on Tableau Server, you properly should be able to publish to there without issues
## 错误报告
-在这里打开github问题（issue）
+如有问题，请报告错误至Apache Kylin JIRA，或者发送邮件到dev邮件列表。
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/tutorial/odbc.md
----------------------------------------------------------------------
diff --git a/website/_docs/tutorial/odbc.md b/website/_docs/tutorial/odbc.md
index d65b23f..ec77c67 100644
--- a/website/_docs/tutorial/odbc.md
+++ b/website/_docs/tutorial/odbc.md
@@ -25,11 +25,11 @@ since: v0.7.1
## Installation
1. Uninstall existing Kylin ODBC first, if you already installled it before
-2. Download the attached driver installer at [KylinOLAP/odbc-driver/exe](https://github.com/KylinOLAP/odbc-driver/tree/master/exe), run it.
+2. Download ODBC Driver from [download](../../download/).
* For 32 bit Tableau Desktop: Please install KylinODBCDriver (x86).exe
* For 64 bit Tableau Desktop: Please install KylinODBCDriver (x64).exe
3. Both drivers already be installed on Tableau Server, you properly should be able to publish to there without issues
## Bug Report
-Open github issue here
+Please open Apache Kylin JIRA to report bug, or send to dev mailing list.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_docs/tutorial/tableau.md
----------------------------------------------------------------------
diff --git a/website/_docs/tutorial/tableau.md b/website/_docs/tutorial/tableau.md
index 1897152..9735bec 100644
--- a/website/_docs/tutorial/tableau.md
+++ b/website/_docs/tutorial/tableau.md
@@ -13,11 +13,9 @@ since: v0.7.1
> * Please always select Fact Table first, then add lookup tables with correct join condition (defined join type in cube)
> * Do not try to join between fact tables or lookup tables;
> * You can try to use high cardinality dimensions like seller id as Tableau Filter, but the engine will only return limited seller id in Tableau's filter now.
->
-> More detail information or any issue, please contact Kylin Team: `kylinolap@gmail.com`
### Step 1. Install ODBC Driver
-Refer to wiki page [Kylin ODBC Driver Tutorial](https://github.com/KylinOLAP/Kylin/wiki/Kylin-ODBC-Driver-Tutorial).
+Refer to wiki page [Kylin ODBC Driver Tutorial](./odbc.html).
### Step 2. Connect to Kylin Server
> We recommended to use Connect Using Driver instead of Using DSN since Tableau team will not manage your DSN on Tableau Servers.
@@ -30,7 +28,7 @@ Enter your Sever location and credentials: server host, port, username and passw
-Click "Connect" to get the list of projects that you have permission to access. See details about permission in [Kylin Cube Permission Grant Tutorial](https://github.com/KylinOLAP/Kylin/wiki/Kylin-Cube-Permission-Grant-Tutorial). Then choose the project you want to connect in the drop down list.
+Click "Connect" to get the list of projects that you have permission to access. See details about permission in [Kylin Cube Permission Grant Tutorial](./acl.html). Then choose the project you want to connect in the drop down list.
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/_includes/footer.html
----------------------------------------------------------------------
diff --git a/website/_includes/footer.html b/website/_includes/footer.html
index 9f0bebc..eca5273 100644
--- a/website/_includes/footer.html
+++ b/website/_includes/footer.html
@@ -24,8 +24,19 @@
<div>
Apache Kylin is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
</div>
- <p style="text-align:center" > Apache Kylin is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0. </a>
- </p>
+ <a href="http://www.apache.org">
+ <img id="asf-logo" alt="Apache Software Foundation" src="assets/images/feather-small.gif">
+ </a>
+ <a href="http://incubator.apache.org/">
+ <img id="incubator-logo" alt="Apache Incubator" src="assets/images/egg-logo.png">
+ </a>
+
+ <div id="copyright">
+ <p>Copyright © 2014 The Apache Software Foundation, Licensed under the <a
+ href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache, the
+ Apache feather logo, and the Apache Incubator project logo are trademarks of The Apache Software
+ Foundation.</p>
+ </div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/download/index.cn.md
----------------------------------------------------------------------
diff --git a/website/download/index.cn.md b/website/download/index.cn.md
index 8587d42..7907867 100644
--- a/website/download/index.cn.md
+++ b/website/download/index.cn.md
@@ -19,11 +19,8 @@ __二进制包__
* [Installation Guide](../docs/install)
* 如何从源文件生成二进制包，请参考这篇[教程](http://kylin.incubator.apache.org/docs/howto/howto_package.html)
-<!--
__ODBC 驱动__
Apache Kylin ODBC驱动:
- * [Kylin ODBC Driver](KylinODBC.zip)
-
--->
+ * [Kylin ODBC Driver](KylinODBCDriver.zip)
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/beb87798/website/download/index.md
----------------------------------------------------------------------
diff --git a/website/download/index.md b/website/download/index.md
index df0f3f8..085718e 100644
--- a/website/download/index.md
+++ b/website/download/index.md
@@ -21,14 +21,11 @@ For convenience, there's binary package also available:
* [Installation Guide](../docs/install)
* Generate binary package from source, please refer to this [guide](../docs/howto/howto_package.html)
-<!--
__ODBC Driver__
And ODBC Driver could be find here:
- * [Kylin ODBC Driver](KylinODBC.zip)
- * _ODBC Driver's source sode avaliable with 0.8 branch_
--->
+ * [Kylin ODBC Driver](KylinODBCDriver.zip)
__Development Version (v0.7.x)__
[2/3] incubator-kylin git commit: KYLIN-884 update website
Posted by lu...@apache.org.
KYLIN-884 update website
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/655a6589
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/655a6589
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/655a6589
Branch: refs/heads/0.7-staging
Commit: 655a6589fed917784b614bb47762951c864e4660
Parents: beb8779
Author: Luke Han <lu...@apache.org>
Authored: Mon Jul 20 11:38:21 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Mon Jul 20 11:38:21 2015 +0800
----------------------------------------------------------------------
website/_docs/howto/howto_docs.md | 147 +++++++++++++++++++++++++++
website/assets/images/egg-logo.png | Bin 0 -> 8626 bytes
website/assets/images/feather-small.gif | Bin 0 -> 7129 bytes
3 files changed, 147 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/655a6589/website/_docs/howto/howto_docs.md
----------------------------------------------------------------------
diff --git a/website/_docs/howto/howto_docs.md b/website/_docs/howto/howto_docs.md
new file mode 100644
index 0000000..510a0ba
--- /dev/null
+++ b/website/_docs/howto/howto_docs.md
@@ -0,0 +1,147 @@
+---
+layout: docs
+title: How to write document
+categories: howto
+permalink: /docs/howto/howto_docs.html
+version: v0.7.2
+since: v0.7.2
+---
+
+## Before your work
+
+Install following tools before you add or edit documentation:
+1. First, make sure Ruby and Gem are works on your machine
+_For Mac User, please refer [this](https://github.com/sstephenson/rbenv#homebrew-on-mac-os-x) to setup ruby env._
+2. Then, install [Jekyll](http://jekyllrb.com), and plugins, for example:
+`gem install jekyll jekyll-multiple-languages kramdown rouge`
+3. [Jekyll Multiple Languages Plugin](http://jekyll-langs.liaohuqiu.net/cn/)
+4. And any markdown editor
+
+## About Jekyll
+Jekyll is a Ruby script to generate a static HTML website from source text and themes, the HTML is generated before being deployed to the web server. Jekyll also happens to be the engine behind GitHub Pages.
+
+Here are good reference about basic usage of Jekyll: [Learning Jekyll By Example](http://learn.andrewmunsell.com/learn/jekyll-by-example/tutorial)
+
+Apache Kylin's website and documentation is using Jekyll to manage and generate final content which avaliable at [http://kylin.incubator.apache.org](http://kylin.incubator.apache.org).
+
+## Multi-Language
+To draft Chinese version document or translate existing one, just add or copy that doc and name with .cn.md as sufffix. It will generate under /cn folder with same name as html file.
+To add other language, please update _config.yml and follow the same pattern as Chinese version.
+
+# Kylin document sturcture and navigation menu
+
+1. __Home Page__: _"index.md"_ Home page of Docs
+2. __Getting Started__: _"gettingstarted"_ General docs about Apache Kylin, including FAQ, Terminology
+3. __Installation__: _"install"_ Apache Kylin installation guide
+4. __Tutorial__: _"tutorial"_ User tutorial about how to use Apache Kylin
+5. __How To__: _"howto"_ Guide for more detail help
+6. __Development__: _"development"_ For developer to contribute, integration with other application and extend Apache Kylin
+7. __Others__: Other docs.
+
+The menu is managed by Jekyll collection:
+
+* ___data/docs.yml__: English version menu structure
+* ___data/docs-cn.yml__: Chinese version menu structure
+* __add new menu item__: To add new item: create new docs under relative folder, e.g howto_example.md. add following Front Mark:
+
+```
+---
+layout: docs
+title: How to expamle
+categories: howto
+permalink: /docs/howto/howto_example.html
+version: v0.7.2
+since: v0.7.2
+---
+```
+
+change the __permalink__ to exactly link
+Then add item to docs.yml like:
+
+```
+- title: How To
+ docs:
+ - howto/howto_contribute
+ - howto/howto_jdbc
+ - howto/howto_example
+```
+
+# How to edit document
+Open doc with any markdown editor, draft content and preview in local.
+
+Sample Doc:
+
+```
+---
+layout: docs
+title: How to example
+categories: howto
+permalink: /docs/howto/howto_example.html
+version: v0.7.2
+since: v0.7.2
+---
+
+## This is example doc
+The quick brown fox jump over the lazy dog.
+
+```
+
+# How to add image
+All impage please put under _images_ folder, in your document, please using below sample to include image:
+
+```
+
+
+```
+
+# How to add link
+Using relative path for site links, for example:
+
+```
+[REST API](docs/development/rest_api.html).
+
+```
+
+# How to add code highlight
+We are using [Rouge](https://github.com/jneen/rouge) to highlight code syntax.
+check this doc's source code for more detail sample.
+
+# How to preview in your local
+You can preview in your markdown editor, to check exactly what it will looks like on website, please run Jekyll from "website" folder:
+```
+jekyll s
+
+```
+Then access http://127.0.0.1:4000 in your browser.
+
+## How to publish to website (for committer only)
+
+### Setup
+
+1. `cd docs/website`
+2. `svn co https://svn.apache.org/repos/asf/incubator/kylin/site _site`
+3. `sudo apt-get install rubygems ruby2.1-dev zlib1g-dev` (linux)
+4. `sudo gem install bundler github-pages jekyll`
+5. `bundle install`
+
+___site__ folder is working dir which will be removed anytime by maven or git, please make sure only check out from svn when you want to publish to website.
+
+### Running locally
+Before opening a pull request or push to git repo, you can preview changes from your local box with following:
+
+1. `cd website`
+2. `jekyll s`
+3. Open [http://127.0.0.1:4000](http://127.0.0.1:4000) in your browser
+
+### Pushing to site
+
+1. `cd website/_site`
+2. `svn status`
+3. You'll need to `svn add` any new files
+4. `svn commit -m 'UPDATE MESSAGE'`
+
+Within a few minutes, svnpubsub should kick in and you'll be able to
+see the results at
+[http://kylin.incubator.apache.org](http://kylin.incubator.apache.org/).
+
+
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/655a6589/website/assets/images/egg-logo.png
----------------------------------------------------------------------
diff --git a/website/assets/images/egg-logo.png b/website/assets/images/egg-logo.png
new file mode 100644
index 0000000..c04e70d
Binary files /dev/null and b/website/assets/images/egg-logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/655a6589/website/assets/images/feather-small.gif
----------------------------------------------------------------------
diff --git a/website/assets/images/feather-small.gif b/website/assets/images/feather-small.gif
new file mode 100644
index 0000000..fb4445f
Binary files /dev/null and b/website/assets/images/feather-small.gif differ
[3/3] incubator-kylin git commit: Merge branch '0.7-staging' of
https://git-wip-us.apache.org/repos/asf/incubator-kylin into 0.7-staging
Posted by lu...@apache.org.
Merge branch '0.7-staging' of https://git-wip-us.apache.org/repos/asf/incubator-kylin into 0.7-staging
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/df020d7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/df020d7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/df020d7c
Branch: refs/heads/0.7-staging
Commit: df020d7c761cc502cccdd0c997619434d4c8b7ba
Parents: 655a658 87d316f
Author: Luke Han <lu...@apache.org>
Authored: Mon Jul 20 11:38:36 2015 +0800
Committer: Luke Han <lu...@apache.org>
Committed: Mon Jul 20 11:38:36 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/cube/CubeManager.java | 21 +++++++++++++++++---
.../org/apache/kylin/cube/CubeSegmentsTest.java | 6 +++---
.../apache/kylin/dict/DictionaryManager.java | 9 +++++++++
.../org/apache/kylin/dict/lookup/FileTable.java | 9 +++++++++
.../org/apache/kylin/dict/lookup/HiveTable.java | 5 +++++
.../apache/kylin/dict/lookup/ReadableTable.java | 3 +++
.../apache/kylin/dict/lookup/SnapshotTable.java | 5 +++++
.../kylin/job/cube/MergeDictionaryStep.java | 10 ++++++----
.../kylin/job/BuildCubeWithEngineTest.java | 4 ++++
.../job/hadoop/cube/MergeCuboidMapperTest.java | 2 +-
.../kylin/rest/controller/CubeController.java | 2 +-
.../kylin/rest/request/JobBuildRequest.java | 10 ++++++++++
.../apache/kylin/rest/service/JobService.java | 4 ++--
13 files changed, 76 insertions(+), 14 deletions(-)
----------------------------------------------------------------------