Skip to content

Commit 1b94ae1

Browse files
author
astroshim
committed
Merge branch 'master' into ZEPPELIN-1023
rebase
2 parents a580476 + c590649 commit 1b94ae1

File tree

243 files changed

+5659
-3107
lines changed

Some content is hidden

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

243 files changed

+5659
-3107
lines changed

‎.gitignore‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ conf/credentials.json
3232
spark/dependency-reduced-pom.xml
3333
reports
3434

35-
#webapp
35+
# webapp
3636
zeppelin-web/node_modules
3737
zeppelin-web/dist
3838
zeppelin-web/.tmp
@@ -41,8 +41,9 @@ zeppelin-web/bower_components
4141
**nbproject/
4242
**node/
4343

44-
#R
44+
# R
4545
/r/lib/
46+
.Rhistory
4647

4748
# project level
4849
/logs/
@@ -80,7 +81,7 @@ Thumbs.db
8081
.project
8182
.settings/
8283

83-
#intelliJ IDEA project files
84+
# intelliJ IDEA project files
8485
.idea/
8586
*.iml
8687

‎.travis.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ before_install:
6767
- echo 'R_LIBS=~/R' > ~/.Renviron
6868
- R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org', lib='~/R')"
6969
- export R_LIBS='~/R'
70-
- "export DISPLAY=:99.0"
71-
- "sh -e /etc/init.d/xvfb start"
70+
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1600x1024x16"
7271

7372
install:
7473
- mvn $BUILD_FLAG $PROFILE -B

‎LICENSE‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,13 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
235235
(The MIT License) jekyll-bootstrap 0.3.0 (https://github.com/plusjade/jekyll-bootstrap) - https://github.com/plusjade/jekyll-bootstrap
236236
(The MIT License) jekyll 1.3.0 (http://jekyllrb.com/) - https://github.com/jekyll/jekyll/blob/v1.3.0/LICENSE
237237

238-
238+
========================================================================
239+
MIT-style licenses
240+
========================================================================
241+
The following components are provided under the MIT-style license. See project link for details.
242+
The text of each license is also included at licenses/LICENSE-[project]-[version].txt.
243+
244+
(MIT Style) jekyll-table-of-contents (https://github.com/ghiculescu/jekyll-table-of-contents) - https://github.com/ghiculescu/jekyll-table-of-contents/blob/master/LICENSE.txt
239245

240246
========================================================================
241247
Apache licenses

‎alluxio/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@
132132

133133
<build>
134134
<plugins>
135-
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-deploy-plugin</artifactId>
138-
<version>2.7</version>
139-
<configuration>
140-
<skip>true</skip>
141-
</configuration>
142-
</plugin>
143-
144135
<plugin>
145136
<artifactId>maven-enforcer-plugin</artifactId>
146137
<version>1.3.1</version>

‎alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
2929
import org.apache.zeppelin.interpreter.InterpreterResult;
3030
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
31+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
3132
import org.slf4j.Logger;
3233
import org.slf4j.LoggerFactory;
3334

@@ -174,13 +175,13 @@ public int getProgress(InterpreterContext context) {
174175
}
175176

176177
@Override
177-
public List<String> completion(String buf, int cursor) {
178+
public List<InterpreterCompletion> completion(String buf, int cursor) {
178179
String[] words = splitAndRemoveEmpty(splitAndRemoveEmpty(buf, "\n"), " ");
179180
String lastWord = "";
180181
if (words.length > 0) {
181182
lastWord = words[ words.length - 1 ];
182183
}
183-
ArrayList<String> voices = new ArrayList<String>();
184+
ArrayList voices = new ArrayList<>();
184185
for (String command : keywords) {
185186
if (command.startsWith(lastWord)) {
186187
voices.add(command);

‎alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import alluxio.client.file.URIStatus;
3232
import org.apache.zeppelin.interpreter.InterpreterResult;
3333
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
34+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
3435
import org.junit.*;
3536

3637
import alluxio.Constants;
@@ -76,19 +77,19 @@ public final void before() throws Exception {
7677

7778
@Test
7879
public void testCompletion() {
79-
List<String> expectedResultOne = Arrays.asList("cat", "chgrp",
80+
List expectedResultOne = Arrays.asList("cat", "chgrp",
8081
"chmod", "chown", "copyFromLocal", "copyToLocal", "count",
8182
"createLineage");
82-
List<String> expectedResultTwo = Arrays.asList("copyFromLocal",
83+
List expectedResultTwo = Arrays.asList("copyFromLocal",
8384
"copyToLocal", "count");
84-
List<String> expectedResultThree = Arrays.asList("copyFromLocal", "copyToLocal");
85-
List<String> expectedResultNone = new ArrayList<String>();
86-
87-
List<String> resultOne = alluxioInterpreter.completion("c", 0);
88-
List<String> resultTwo = alluxioInterpreter.completion("co", 0);
89-
List<String> resultThree = alluxioInterpreter.completion("copy", 0);
90-
List<String> resultNotMatch = alluxioInterpreter.completion("notMatch", 0);
91-
List<String> resultAll = alluxioInterpreter.completion("", 0);
85+
List expectedResultThree = Arrays.asList("copyFromLocal", "copyToLocal");
86+
List expectedResultNone = new ArrayList<String>();
87+
88+
List<InterpreterCompletion> resultOne = alluxioInterpreter.completion("c", 0);
89+
List<InterpreterCompletion> resultTwo = alluxioInterpreter.completion("co", 0);
90+
List<InterpreterCompletion> resultThree = alluxioInterpreter.completion("copy", 0);
91+
List<InterpreterCompletion> resultNotMatch = alluxioInterpreter.completion("notMatch", 0);
92+
List<InterpreterCompletion> resultAll = alluxioInterpreter.completion("", 0);
9293

9394
Assert.assertEquals(expectedResultOne, resultOne);
9495
Assert.assertEquals(expectedResultTwo, resultTwo);

‎angular/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@
6060

6161
<build>
6262
<plugins>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-deploy-plugin</artifactId>
66-
<version>2.7</version>
67-
<configuration>
68-
<skip>true</skip>
69-
</configuration>
70-
</plugin>
71-
7263
<plugin>
7364
<artifactId>maven-enforcer-plugin</artifactId>
7465
<version>1.3.1</version>

‎angular/src/main/java/org/apache/zeppelin/angular/AngularInterpreter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.zeppelin.interpreter.InterpreterResult;
2727
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
2828
import org.apache.zeppelin.interpreter.InterpreterResult.Type;
29+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
2930
import org.apache.zeppelin.scheduler.Scheduler;
3031
import org.apache.zeppelin.scheduler.SchedulerFactory;
3132

@@ -69,8 +70,8 @@ public int getProgress(InterpreterContext context) {
6970
}
7071

7172
@Override
72-
public List<String> completion(String buf, int cursor) {
73-
return new LinkedList<String>();
73+
public List<InterpreterCompletion> completion(String buf, int cursor) {
74+
return new LinkedList<>();
7475
}
7576

7677
@Override

‎bin/install-interpreter.sh‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/bin/bash
2+
#
3+
# Licensed to the Apache Software Foundation (ASF) under one
4+
# or more contributor license agreements. See the NOTICE file
5+
# distributed with this work for additional information
6+
# regarding copyright ownership. The ASF licenses this file
7+
# to you under the Apache License, Version 2.0 (the
8+
# "License"); you may not use this file except in compliance
9+
# with the License. You may obtain a copy of the License at
10+
#
11+
# http://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
# Run Zeppelin
20+
#
21+
22+
bin=$(dirname "${BASH_SOURCE-$0}")
23+
bin=$(cd "${bin}">/dev/null; pwd)
24+
25+
. "${bin}/common.sh"
26+
27+
28+
ZEPPELIN_INSTALL_INTERPRETER_MAIN=org.apache.zeppelin.interpreter.install.InstallInterpreter
29+
ZEPPELIN_LOGFILE="${ZEPPELIN_LOG_DIR}/install-interpreter.log"
30+
JAVA_OPTS+=" -Dzeppelin.log.file=${ZEPPELIN_LOGFILE}"
31+
32+
if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
33+
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
34+
fi
35+
addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
36+
37+
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
38+
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes"
39+
fi
40+
addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
41+
42+
addJarInDir "${ZEPPELIN_HOME}/lib"
43+
44+
CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
45+
$ZEPPELIN_RUNNER $JAVA_OPTS -cp $CLASSPATH $ZEPPELIN_INSTALL_INTERPRETER_MAIN ${@}

‎cassandra/pom.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -230,15 +230,6 @@
230230
</executions>
231231
</plugin>
232232

233-
<plugin>
234-
<groupId>org.apache.maven.plugins</groupId>
235-
<artifactId>maven-deploy-plugin</artifactId>
236-
<version>2.7</version>
237-
<configuration>
238-
<skip>true</skip>
239-
</configuration>
240-
</plugin>
241-
242233
<plugin>
243234
<artifactId>maven-enforcer-plugin</artifactId>
244235
<version>1.3.1</version>

0 commit comments

Comments
 (0)