Skip to content

Commit ba91da4

Browse files
prabhjyotsinghprabhjyotsingh
committed
Merge remote-tracking branch 'origin/master' into UserInInterpreterContext
2 parents 57ca577 + e6447b2 commit ba91da4

File tree

51 files changed

+1391
-636
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1391
-636
lines changed

‎.travis.yml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,31 @@ matrix:
1919
include:
2020
# Test all modules
2121
- jdk: "oraclejdk7"
22-
env: SPARK_VER="1.6.0" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Phadoop-2.3 -Ppyspark -Pscalding" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr"
22+
env: SPARK_VER="1.6.0" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Phadoop-2.3 -Ppyspark -Pscalding" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS=""
2323

2424
# Test spark module for 1.5.2
2525
- jdk: "oraclejdk7"
26-
env: SPARK_VER="1.5.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.5 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify"
26+
env: SPARK_VER="1.5.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.5 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
2727

2828
# Test spark module for 1.4.1
2929
- jdk: "oraclejdk7"
30-
env: SPARK_VER="1.4.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.4 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify"
30+
env: SPARK_VER="1.4.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.4 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
3131

3232
# Test spark module for 1.3.1
3333
- jdk: "oraclejdk7"
34-
env: SPARK_VER="1.3.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.3 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify"
34+
env: SPARK_VER="1.3.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.3 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
3535

36-
# Test spark module for 1.2.1
36+
# Test spark module for 1.2.2
3737
- jdk: "oraclejdk7"
38-
env: SPARK_VER="1.2.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.2 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify"
38+
env: SPARK_VER="1.2.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.2 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
3939

4040
# Test spark module for 1.1.1
4141
- jdk: "oraclejdk7"
42-
env: SPARK_VER="1.1.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.1 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify"
42+
env: SPARK_VER="1.1.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.1 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
43+
44+
# Test selenium with spark module for 1.6.0
45+
- jdk: "oraclejdk7"
46+
env: TEST_SELENIUM="true" SPARK_VER="1.6.0" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Phadoop-2.3 -Ppyspark" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark -Dtest=org.apache.zeppelin.AbstractFunctionalSuite -DfailIfNoTests=false"
4347

4448
before_install:
4549
- "export DISPLAY=:99.0"
@@ -53,7 +57,7 @@ before_script:
5357
- echo "export SPARK_HOME=`pwd`/spark-$SPARK_VER-bin-hadoop$HADOOP_VER" > conf/zeppelin-env.sh
5458

5559
script:
56-
- mvn $TEST_FLAG $PROFILE -B
60+
- mvn $TEST_FLAG $PROFILE -B $TEST_PROJECTS
5761

5862
after_failure:
5963
- cat target/rat.txt

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Contributing to Zeppelin (Source code, Documents, Image, Website) means you agre
77
2. If not, create a ticket describing the change you're proposing in the [Jira issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN)
88
3. Contribute your patch via Pull Request.
99

10+
Before you start, please read the [Code of Conduct](http://www.apache.org/foundation/policies/conduct.html) carefully, familiarize yourself with it and refer to it whenever you need it.
11+
12+
For those of you who are not familiar with Apache project, understanding [How it works](http://www.apache.org/foundation/how-it-works.html) would be quite helpful.
13+
1014
## Creating a Pull Request
1115
In order to make the review process easier, please follow this template when making a Pull Request:
1216

@@ -144,13 +148,13 @@ First of all, you need the Zeppelin source code. The official location for Zeppe
144148
Get the source code on your development machine using git.
145149
146150
```
147-
git clone http://git.apache.org/incubator-zeppelin.git zeppelin
151+
git clone git://git.apache.org/incubator-zeppelin.git zeppelin
148152
```
149153
150-
You may also want to develop against a specific release. For example, for branch-0.1
154+
You may also want to develop against a specific branch. For example, for branch-0.5.6
151155
152156
```
153-
git clone -b branch-0.1 http://git.apache.org/incubator-zeppelin.git zeppelin
157+
git clone -b branch-0.5.6 git://git.apache.org/incubator-zeppelin.git zeppelin
154158
```
155159
156160
or with write access

‎SECURITY-README.md‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@ The scope of this PR is to require credentials to access Zeppelin. To achieve th
3333
Apache Shiro sits as a servlet filter between the browser and the exposed services and handles the required authentication without any programming required. (See Apache Shiro for more info).
3434
## Websocket security
3535
Securing the HTTP endpoints is not enough, since Zeppelin also communicates with the browser through websockets. To secure this channel, we take the following approach:
36-
1. The browser on startup requests a ticket through HTTP
37-
2. The Apache Shiro Servlet filter handles the user auth
38-
3. Once the user is authenticated, a ticket is assigned to this user and the ticket is returned to the browser
36+
1. The browser on startup requests a ticket through HTTP
37+
2. The Apache Shiro Servlet filter handles the user auth
38+
3. Once the user is authenticated, a ticket is assigned to this user and the ticket is returned to the browser
3939

4040
All websockets communications require the username and ticket to be submitted by the browser. Upon receiving a websocket message, the server checks that the ticket received is the one assigned to the username through the HTTP request (step 3 above).
41-
42-
43-

‎docs/_config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ author :
2121
twitter : ASF
2222
feedburner : feedname
2323

24+
ZEPPELIN_VERSION : 0.6.0-incubating-SNAPSHOT
25+
2426
# The production_url is only used when full-domain names are needed
2527
# such as sitemap.txt
2628
# Most places will/should use BASE_PATH to make the urls

‎docs/_includes/themes/zeppelin/_navigation.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<li role="separator" class="divider"></li>
3232
<!-- li><span><b>Guide</b><span></li -->
3333
<li><a href="{{BASE_PATH}}/manual/dynamicform.html">Dynamic Form</a></li>
34+
<li><a href="{{BASE_PATH}}/manual/publish.html">Publish your Paragraph</a></li>
3435
</ul>
3536
</li>
3637
<li>
@@ -45,6 +46,7 @@
4546
<li><a href="{{BASE_PATH}}/interpreter/hbase.html">HBase</a></li>
4647
<li><a href="{{BASE_PATH}}/interpreter/hive.html">Hive</a></li>
4748
<li><a href="{{BASE_PATH}}/interpreter/ignite.html">Ignite</a></li>
49+
<li><a href="{{BASE_PATH}}/interpreter/jdbc.html">JDBC</a></li>
4850
<li><a href="{{BASE_PATH}}/interpreter/lens.html">Lens</a></li>
4951
<li><a href="{{BASE_PATH}}/interpreter/markdown.html">Markdown</a></li>
5052
<li><a href="{{BASE_PATH}}/interpreter/postgresql.html">Postgresql, hawq</a></li>
@@ -86,9 +88,12 @@
8688
<li><a href="{{BASE_PATH}}/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li>
8789
<li><a href="{{BASE_PATH}}/development/howtocontribute.html">How to contribute (code)</a></li>
8890
<li><a href="{{BASE_PATH}}/development/howtocontributewebsite.html">How to contribute (website)</a></li>
91+
<li role="separator" class="divider"></li>
92+
<!-- li><span><b>Shiro Security</b><span></li -->
93+
<li><a href="{{BASE_PATH}}/manual/shiroauthentication.html">Shiro Authentication</a></li>
8994
</ul>
9095
</li>
9196
</ul>
9297
</nav><!--/.navbar-collapse -->
9398
</div>
94-
</div>
99+
</div>

‎docs/assets/themes/zeppelin/img/docs-img/copy-the-link.png‎

185 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/kdc_zeppelin.png‎

7.04 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/link-the-paragraph.png‎

311 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/your-website.png‎

425 KB
Loading

‎docs/assets/themes/zeppelin/img/docs-img/zeppelin-login.png‎

40.3 KB
Loading

0 commit comments

Comments
 (0)