Skip to content

Commit 6d04fa7

Browse files
committed

File tree

149 files changed

+8640
-545
lines changed

Some content is hidden

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

149 files changed

+8640
-545
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
spark/derby.log
1313
spark/metastore_db
1414
spark-1.*-bin-hadoop*
15+
.spark-dist
1516
zeppelin-server/derby.log
1617

1718
lens/lens-cli-hist.log
1819

1920
# conf file
2021
conf/zeppelin-env.sh
22+
conf/zeppelin-env.cmd
2123
conf/zeppelin-site.xml
2224
conf/keystore
2325
conf/truststore

.travis.yml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,34 @@
1515

1616
language: java
1717

18+
sudo: false
19+
20+
cache:
21+
directories:
22+
- .spark-dist
23+
24+
addons:
25+
apt:
26+
sources:
27+
- r-packages-precise
28+
packages:
29+
- r-base-dev
30+
- r-cran-evaluate
31+
- r-cran-base64enc
32+
1833
matrix:
1934
include:
2035
# Test all modules
2136
- 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" TEST_PROJECTS=""
37+
env: SPARK_VER="1.6.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.6 -Pr -Phadoop-2.3 -Ppyspark -Psparkr -Pscalding" BUILD_FLAG="package -Pbuild-distr" TEST_FLAG="verify -Pusing-packaged-distr" TEST_PROJECTS=""
2338

2439
# Test spark module for 1.5.2
2540
- 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" 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"
41+
env: SPARK_VER="1.5.2" HADOOP_VER="2.3" PROFILE="-Pspark-1.5 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,r -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
2742

2843
# Test spark module for 1.4.1
2944
- 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" 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"
45+
env: SPARK_VER="1.4.1" HADOOP_VER="2.3" PROFILE="-Pspark-1.4 -Pr -Phadoop-2.3 -Ppyspark -Psparkr" BUILD_FLAG="package -DskipTests" TEST_FLAG="verify" TEST_PROJECTS="-pl zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,r -Dtest=org.apache.zeppelin.rest.*Test,org.apache.zeppelin.spark* -DfailIfNoTests=false"
3146

3247
# Test spark module for 1.3.1
3348
- jdk: "oraclejdk7"
@@ -41,11 +56,16 @@ matrix:
4156
- jdk: "oraclejdk7"
4257
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"
4358

44-
# Test selenium with spark module for 1.6.0
59+
# Test selenium with spark module for 1.6.1
4560
- 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"
61+
env: TEST_SELENIUM="true" SPARK_VER="1.6.1" 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"
4762

4863
before_install:
64+
- "ls -la .spark-dist"
65+
- mkdir -p ~/R
66+
- echo 'R_LIBS=~/R' > ~/.Renviron
67+
- R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org', lib='~/R')"
68+
- export R_LIBS='~/R'
4969
- "export DISPLAY=:99.0"
5070
- "sh -e /etc/init.d/xvfb start"
5171

@@ -56,6 +76,7 @@ before_script:
5676
- travis_retry ./testing/downloadSpark.sh $SPARK_VER $HADOOP_VER
5777
- ./testing/startSparkCluster.sh $SPARK_VER $HADOOP_VER
5878
- echo "export SPARK_HOME=`pwd`/spark-$SPARK_VER-bin-hadoop$HADOOP_VER" > conf/zeppelin-env.sh
79+
- tail conf/zeppelin-env.sh
5980

6081
script:
6182
- mvn $TEST_FLAG $PROFILE -B $TEST_PROJECTS
@@ -69,6 +90,3 @@ after_failure:
6990
after_script:
7091
- ./testing/stopSparkCluster.sh $SPARK_VER $HADOOP_VER
7192

72-
notifications:
73-
slack:
74-
secure: dtIkPwlf5uTun19p9TtPEAFmrLOMK2COE8TL9m8LXX/N2WzJaKYvAnovMObEV6KEgK2oZ+72Cke7eBI+Hp4FmHZ2B7mQI/PNCfRZthI3cc3zVmMd25yvLH9AlCRa2bC6R885z2copvzaoZtLBkHnPa8bUrUkbmRp40qkDPQpgO4=

LICENSE

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,16 @@ Apache licenses
244244
The following components are provided under the Apache License. See project link for details.
245245
The text of each license is also included at licenses/LICENSE-[project]-[version].txt.
246246

247-
(Apache 2.0) Bootstrap v3.0.2 (http://getbootstrap.com/) - https://github.com/twbs/bootstrap/blob/v3.0.2/LICENSE
247+
(Apache 2.0) Bootstrap v3.0.2 (http://getbootstrap.com/) - https://github.com/twbs/bootstrap/blob/v3.0.2/LICENSE
248+
249+
========================================================================
250+
BSD 3-Clause licenses
251+
========================================================================
252+
The following components are provided under the BSD 3-Clause license. See file headers and project links for details.
253+
254+
(BSD 3 Clause) portions of rscala 1.0.6 (https://dahl.byu.edu/software/rscala/) - https://cran.r-project.org/web/packages/rscala/index.html
255+
r/R/rzeppelin/R/{common.R, globals.R,protocol.R,rServer.R,scalaInterpreter.R,zzz.R }
256+
r/src/main/scala/org/apache/zeppelin/rinterpreter/rscala/{Package.scala, RClient.scala}
257+
258+
(BSD 3 Clause) portions of Scala (http://www.scala-lang.org/download) - http://www.scala-lang.org/download/#License
259+
r/src/main/scala/scala/Console.scala

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ Available profiles are
129129
-Pmapr40
130130
-Pmapr41
131131
-Pmapr50
132+
-Pmapr51
132133
```
133134

134135

bin/common.cmd

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
@echo off
2+
3+
REM Licensed to the Apache Software Foundation (ASF) under one or more
4+
REM contributor license agreements. See the NOTICE file distributed with
5+
REM this work for additional information regarding copyright ownership.
6+
REM The ASF licenses this file to You under the Apache License, Version 2.0
7+
REM (the "License"); you may not use this file except in compliance with
8+
REM the License. You may obtain a copy of the License at
9+
REM
10+
REM http://www.apache.org/licenses/LICENSE-2.0
11+
REM
12+
REM Unless required by applicable law or agreed to in writing, software
13+
REM distributed under the License is distributed on an "AS IS" BASIS,
14+
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
REM See the License for the specific language governing permissions and
16+
REM limitations under the License.
17+
18+
if not defined ZEPPELIN_HOME (
19+
for %%d in ("%~dp0..") do (
20+
set ZEPPELIN_HOME=%%~fd
21+
)
22+
)
23+
24+
if not defined ZEPPELIN_CONF_DIR (
25+
set ZEPPELIN_CONF_DIR=%ZEPPELIN_HOME%\conf
26+
)
27+
28+
if not defined ZEPPELIN_LOG_DIR (
29+
set ZEPPELIN_LOG_DIR=%ZEPPELIN_HOME%\logs
30+
)
31+
32+
if not defined ZEPPELIN_NOTEBOOK_DIR (
33+
set ZEPPELIN_NOTEBOOK_DIR=%ZEPPELIN_HOME%\notebook
34+
)
35+
36+
if not defined ZEPPELIN_PID_DIR (
37+
set ZEPPELIN_PID_DIR=%ZEPPELIN_HOME%\run
38+
)
39+
40+
if not defined ZEPPELIN_WAR (
41+
if exist "%ZEPPELIN_HOME%\zeppelin-web\dist" (
42+
set ZEPPELIN_WAR=%ZEPPELIN_HOME%\zeppelin-web\dist
43+
) else (
44+
for %%d in ("%ZEPPELIN_HOME%\zeppelin-web*.war") do (
45+
set ZEPPELIN_WAR=%%d
46+
)
47+
)
48+
)
49+
50+
if not defined ZEPPELIN_INTERPRETER_DIR (
51+
set ZEPPELIN_INTERPRETER_DIR=%ZEPPELIN_HOME%\interpreter
52+
)
53+
54+
if exist "%ZEPPELIN_CONF_DIR%\zeppelin-env.cmd" (
55+
call "%ZEPPELIN_CONF_DIR%\zeppelin-env.cmd"
56+
)
57+
58+
if not defined ZEPPELIN_CLASSPATH (
59+
set ZEPPELIN_CLASSPATH="%ZEPPELIN_CONF_DIR%"
60+
) else (
61+
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_CONF_DIR%"
62+
)
63+
64+
if not defined ZEPPELIN_ENCODING (
65+
set ZEPPELIN_ENCODING=UTF-8
66+
)
67+
68+
if not defined ZEPPELIN_MEM (
69+
set ZEPPELIN_MEM=-Xms1024m -Xmx1024m -XX:MaxPermSize=512m
70+
)
71+
72+
if not defined ZEPPELIN_JAVA_OPTS (
73+
set ZEPPELIN_JAVA_OPTS=-Dfile.encoding=%ZEPPELIN_ENCODING% %ZEPPELIN_MEM%
74+
) else (
75+
set ZEPPELIN_JAVA_OPTS=%ZEPPELIN_JAVA_OPTS% -Dfile.encoding=%ZEPPELIN_ENCODING% %ZEPPELIN_MEM%
76+
)
77+
78+
if not defined JAVA_OPTS (
79+
set JAVA_OPTS=%ZEPPELIN_JAVA_OPTS%
80+
) else (
81+
set JAVA_OPTS=%JAVA_OPTS% %ZEPPELIN_JAVA_OPTS%
82+
)
83+
84+
if not defined ZEPPELIN_INTP_JAVA_OPTS (
85+
set ZEPPELIN_INTP_JAVA_OPTS=%ZEPPELIN_JAVA_OPTS%
86+
)
87+
88+
if not defined ZEPPELIN_INTP_MEM (
89+
set ZEPPELIN_INTP_MEM=%ZEPPELIN_MEM%
90+
)
91+
92+
set JAVA_INTP_OPTS=%ZEPPELIN_INTP_JAVA_OPTS% -Dfile.encoding=%ZEPPELIN_ENCODING%
93+
94+
if not defined JAVA_HOME (
95+
set ZEPPELIN_RUNNER=java
96+
) else (
97+
set ZEPPELIN_RUNNER=%JAVA_HOME%\bin\java
98+
)
99+
100+
if not defined ZEPPELIN_IDENT_STRING (
101+
set ZEPPELIN_IDENT_STRING=%USERNAME%
102+
)
103+
104+
if not defined DEBUG (
105+
set DEBUG=0
106+
)
107+
108+
if not defined ZEPPELIN_INTERPRETER_REMOTE_RUNNER (
109+
set ZEPPELIN_INTERPRETER_REMOTE_RUNNER=bin\interpreter.cmd
110+
)
111+
112+
exit /b

bin/common.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,18 @@ function addJarInDir(){
8181
fi
8282
}
8383

84+
ZEPPELIN_COMMANDLINE_MAIN=org.apache.zeppelin.utils.CommandLineUtils
85+
86+
function getZeppelinVersion(){
87+
if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
88+
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
89+
fi
90+
addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
91+
CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
92+
$ZEPPELIN_RUNNER -cp $CLASSPATH $ZEPPELIN_COMMANDLINE_MAIN -v
93+
exit 0
94+
}
95+
8496
# Text encoding for
8597
# read/write job into files,
8698
# receiving/displaying query/result.

bin/functions.cmd

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
@echo off
2+
3+
REM Licensed to the Apache Software Foundation (ASF) under one or more
4+
REM contributor license agreements. See the NOTICE file distributed with
5+
REM this work for additional information regarding copyright ownership.
6+
REM The ASF licenses this file to You under the Apache License, Version 2.0
7+
REM (the "License"); you may not use this file except in compliance with
8+
REM the License. You may obtain a copy of the License at
9+
REM
10+
REM http://www.apache.org/licenses/LICENSE-2.0
11+
REM
12+
REM Unless required by applicable law or agreed to in writing, software
13+
REM distributed under the License is distributed on an "AS IS" BASIS,
14+
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
REM See the License for the specific language governing permissions and
16+
REM limitations under the License.
17+
18+
if not "%1"=="" goto %1
19+
20+
exit /b
21+
22+
:ADDEACHJARINDIR
23+
for %%d in ("%~2\*.jar") do (
24+
set ZEPPELIN_CLASSPATH="%%d";!ZEPPELIN_CLASSPATH!
25+
)
26+
exit /b
27+
28+
:ADDEACHJARINDIRRECURSIVE
29+
for /r "%~2" %%d in (*.jar) do (
30+
set ZEPPELIN_CLASSPATH="%%d";!ZEPPELIN_CLASSPATH!
31+
)
32+
exit /b
33+
34+
:ADDJARINDIR
35+
if exist "%~2" (
36+
set ZEPPELIN_CLASSPATH="%~2\*";%ZEPPELIN_CLASSPATH%
37+
)
38+
exit /b

0 commit comments

Comments
 (0)