Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote branch 'upstream/master' into incubator_hbase

Browse source
This commit is contained in:
Rajat Venkatesh 2015-05-22 19:48:31 +05:30
commit bc03f79ab6
24 changed files with 226 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -29,6 +29,7 @@ script:
- mvn verify -Pusing-packaged-distr -B
after_failure:
- cat target/rat.txt
- cat zeppelin-distribution/target/zeppelin-*-SNAPSHOT/zeppelin-*-SNAPSHOT/logs/zeppelin*.log
- cat zeppelin-distribution/target/zeppelin-*-SNAPSHOT/zeppelin-*-SNAPSHOT/logs/zeppelin*.out

4
angular/pom.xml
View file

@ -22,13 +22,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-angular</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Angular interpreter</name>
<url>http://zeppelin.incubator.apache.org</url>

23
bin/common.sh
View file

@ -70,28 +70,19 @@ fi
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_CONF_DIR}"
function addJarInDir(){
function addEachJarInDir(){
if [[ -d "${1}" ]]; then
for jar in $(find -L "${1}" -maxdepth 1 -name '*jar'); do
ZEPPELIN_CLASSPATH="$jar:$ZEPPELIN_CLASSPATH"
done
fi
}
addJarInDir "${ZEPPELIN_HOME}"
addJarInDir "${ZEPPELIN_HOME}/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
fi
if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
fi
function addJarInDir(){
if [[ -d "${1}" ]]; then
export ZEPPELIN_CLASSPATH="${1}/*:${ZEPPELIN_CLASSPATH}"
fi
}
if [[ ! -z "${SPARK_HOME}" ]] && [[ -d "${SPARK_HOME}" ]]; then
addJarInDir "${SPARK_HOME}"
@ -106,8 +97,6 @@ if [[ ! -z "${HADOOP_CONF_DIR}" ]] && [[ -d "${HADOOP_CONF_DIR}" ]]; then
fi
export ZEPPELIN_CLASSPATH
export SPARK_CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
export CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
# Text encoding for
# read/write job into files,

9
bin/interpreter.sh
View file

@ -49,10 +49,16 @@ fi
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_CONF_DIR}"
# construct classpath
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes"
fi
addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
addJarInDir "${INTERPRETER_DIR}"
export CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
export SPARK_CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
HOSTNAME=$(hostname)
ZEPPELIN_SERVER=org.apache.zeppelin.interpreter.remote.RemoteInterpreterServer
@ -68,7 +74,6 @@ if [[ ! -d "${ZEPPELIN_LOG_DIR}" ]]; then
fi
${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} -cp ${CLASSPATH} ${ZEPPELIN_SERVER} ${PORT} &
pid=$!
if [[ -z "${pid}" ]]; then

22
bin/zeppelin-daemon.sh
View file

@ -54,6 +54,28 @@ ZEPPELIN_PID="${ZEPPELIN_PID_DIR}/zeppelin-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.
ZEPPELIN_MAIN=org.apache.zeppelin.server.ZeppelinServer
JAVA_OPTS+=" -Dzeppelin.log.file=${ZEPPELIN_LOGFILE}"
# construct classpath
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes"
fi
if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
fi
if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
fi
addJarInDir "${ZEPPELIN_HOME}"
addJarInDir "${ZEPPELIN_HOME}/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
if [[ "${ZEPPELIN_NICENESS}" = "" ]]; then
export ZEPPELIN_NICENESS=0
fi

22
bin/zeppelin.sh
View file

@ -51,6 +51,28 @@ LOG="${ZEPPELIN_LOG_DIR}/zeppelin-cli-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.out"
ZEPPELIN_SERVER=org.apache.zeppelin.server.ZeppelinServer
JAVA_OPTS+=" -Dzeppelin.log.file=${ZEPPELIN_LOGFILE}"
# construct classpath
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes"
fi
if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
fi
if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
fi
addJarInDir "${ZEPPELIN_HOME}"
addJarInDir "${ZEPPELIN_HOME}/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
if [[ ! -d "${ZEPPELIN_LOG_DIR}" ]]; then
echo "Log dir doesn't exist, create ${ZEPPELIN_LOG_DIR}"
$(mkdir -p "${ZEPPELIN_LOG_DIR}")

4
hive/pom.xml
View file

@ -22,13 +22,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-hive</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Hive interpreter</name>
<url>http://www.apache.org</url>

4
markdown/pom.xml
View file

@ -22,13 +22,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-markdown</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Markdown interpreter</name>
<url>http://zeppelin.incubator.apache.org</url>

2
notebook/2A94M5J1Z/note.json
View file

@ -67,7 +67,7 @@
},
{
"title": "Load data into table",
"text": "import sys.process._\n// sc is an existing SparkContext.\nval sqlContext \u003d new org.apache.spark.sql.SQLContext(sc)\n\n\nval zeppelinHome \u003d (\"pwd\" !!).replace(\"\\n\", \"\")\nval bankText \u003d sc.textFile(s\"$zeppelinHome/data/bank-full.csv\")\n\ncase class Bank(age: Integer, job: String, marital: String, education: String, balance: Integer)\n\nval bank \u003d bankText.map(s \u003d\u003e s.split(\";\")).filter(s \u003d\u003e s(0) !\u003d \"\\\"age\\\"\").map(\n s \u003d\u003e Bank(s(0).toInt, \n s(1).replaceAll(\"\\\"\", \"\"),\n s(2).replaceAll(\"\\\"\", \"\"),\n s(3).replaceAll(\"\\\"\", \"\"),\n s(5).replaceAll(\"\\\"\", \"\").toInt\n )\n).toDF()\nbank.registerTempTable(\"bank\")\n\n",
"text": "import sys.process._\n// sc is an existing SparkContext.\nval sqlContext \u003d new org.apache.spark.sql.SQLContext(sc)\n\n\nval zeppelinHome \u003d (\"pwd\" !!).replace(\"\\n\", \"\")\nval bankText \u003d sc.textFile(s\"file://$zeppelinHome/data/bank-full.csv\")\n\ncase class Bank(age: Integer, job: String, marital: String, education: String, balance: Integer)\n\nval bank \u003d bankText.map(s \u003d\u003e s.split(\";\")).filter(s \u003d\u003e s(0) !\u003d \"\\\"age\\\"\").map(\n s \u003d\u003e Bank(s(0).toInt, \n s(1).replaceAll(\"\\\"\", \"\"),\n s(2).replaceAll(\"\\\"\", \"\"),\n s(3).replaceAll(\"\\\"\", \"\"),\n s(5).replaceAll(\"\\\"\", \"\").toInt\n )\n).toDF()\nbank.registerTempTable(\"bank\")\n\n",
"config": {
"colWidth": 12.0,
"graph": {

55
pom.xml
View file

@ -35,7 +35,7 @@
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin</artifactId>
<packaging>pom</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin</name>
<description>Zeppelin project</description>
<url>http://zeppelin.incubator.apache.org/</url>
@ -1099,15 +1099,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.13</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
@ -1123,16 +1126,24 @@
</excludes> <includes> <include>**/itest/**</include> </includes> </configuration>
</execution> </executions> -->
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
@ -1147,7 +1158,6 @@
</configuration>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
@ -1204,47 +1214,6 @@
</pluginManagement>
</build>
<repositories>
<!-- For dependency recosiled version of hive_test -->
<repository>
<id>nflabs public repository</id>
<url>https://raw.github.com/NFLabs/mvn-repo/master/releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<!-- for for jdo/jdo2-api/2.3-ec -->
<repository>
<id>cdh-repository</id>
<name>CDH Repository</name>
<url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<!-- for s3-upload-maven-pugin 1.2-SNAPSHOT until this one merged https://github.com/bazaarvoice/s3-upload-maven-plugin/pull/2 -->
<pluginRepository>
<id>nflabs public repository snspshots</id>
<url>https://github.com/NFLabs/mvn-repo/raw/master/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>
<id>build-distr</id>

4
shell/pom.xml
View file

@ -22,13 +22,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-shell</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Shell interpreter</name>
<url>http://zeppelin.incubator.apache.org</url>

14
spark/pom.xml
View file

@ -22,13 +22,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-spark</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Spark</name>
<description>Zeppelin spark support</description>
<url>http://zeppelin.incubator.apache.org</url>
@ -379,7 +379,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
<version>2.8</version>
<executions>
<execution>
<id>copy-dependencies</id>
@ -395,13 +395,6 @@
<includeGroupIds>org.datanucleus</includeGroupIds>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<execution>
<phase>package</phase>
<goals>
@ -424,6 +417,7 @@
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

49
spark/src/main/resources/python/zeppelin_pyspark.py
View file

@ -15,9 +15,10 @@
# limitations under the License.
#
import sys, getopt
import sys, getopt, traceback
from py4j.java_gateway import java_import, JavaGateway, GatewayClient
from py4j.protocol import Py4JJavaError
from pyspark.conf import SparkConf
from pyspark.context import SparkContext
from pyspark.rdd import RDD
@ -85,9 +86,7 @@ while True :
try:
stmts = req.statements().split("\n")
jobGroup = req.jobGroup()
single = None
incomplete = None
compiledCode = None
final_code = None
for s in stmts:
if s == None or len(s.strip()) == 0:
@ -97,44 +96,24 @@ while True :
if s.strip().startswith("#"):
continue
if s[0] != " " and s[0] != "\t":
if incomplete != None:
raise incomplete
if compiledCode != None:
sc.setJobGroup(jobGroup, "Zeppelin")
eval(compiledCode)
compiledCode = None
single = None
incomplete = None
if single == None:
single = s
if final_code:
final_code += "\n" + s
else:
single += "\n" + s
final_code = s
try :
compiledCode = compile(single, "<string>", "single")
incomplete = None
except SyntaxError as e:
if str(e).startswith("unexpected EOF while parsing") :
# incomplete expression
incomplete = e
continue
else :
# actual error
raise e
if incomplete != None:
raise incomplete
if compiledCode != None:
if final_code:
compiledCode = compile(final_code, "<string>", "exec")
sc.setJobGroup(jobGroup, "Zeppelin")
eval(compiledCode)
intp.setStatementsFinished(output.get(), False)
except Py4JJavaError:
excInnerError = traceback.format_exc() # format_tb() does not return the inner exception
innerErrorStart = excInnerError.find("Py4JJavaError:")
if innerErrorStart > -1:
excInnerError = excInnerError[innerErrorStart:]
intp.setStatementsFinished(excInnerError + str(sys.exc_info()), True)
except:
intp.setStatementsFinished(str(sys.exc_info()), True)
output.reset()

6
tajo/pom.xml
View file

@ -21,13 +21,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-tajo</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Tajo interpreter</name>
<url>http://www.apache.org</url>
@ -135,4 +135,4 @@
</build>
</project>
</project>

4
zeppelin-distribution/pom.xml
View file

@ -23,7 +23,7 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>zeppelin-distribution</artifactId>
@ -147,7 +147,7 @@
<plugin>
<groupId>com.bazaarvoice.maven.plugins</groupId>
<artifactId>s3-upload-maven-plugin</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<configuration>
<bucketName>zeppel.in</bucketName>
<endpoint>s3-ap-northeast-1.amazonaws.com</endpoint>

4
zeppelin-interpreter/pom.xml
View file

@ -24,13 +24,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-interpreter</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Interpreter</name>
<description>Zeppelin Interpreter</description>
<url>http://zeppelin.incubator.apache.org</url>

23
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
View file

@ -324,18 +324,19 @@ public class RemoteInterpreter extends Interpreter {
super.setInterpreterGroup(interpreterGroup);
synchronized (interpreterGroupReference) {
if (interpreterGroupReference
.containsKey(getInterpreterGroupKey(interpreterGroup))) {
interpreterGroupReference.remove(getInterpreterGroupKey(interpreterGroup));
RemoteInterpreterProcess intpProcess = interpreterGroupReference
.get(getInterpreterGroupKey(interpreterGroup));
// when interpreter process is not created or terminated
if (intpProcess == null || (!intpProcess.isRunning() && intpProcess.getPort() > 0)) {
interpreterGroupReference.put(getInterpreterGroupKey(interpreterGroup),
new RemoteInterpreterProcess(interpreterRunner,
interpreterPath, env, interpreterContextRunnerPool));
logger.info("setInterpreterGroup = "
+ getInterpreterGroupKey(interpreterGroup) + " class=" + className
+ ", path=" + interpreterPath);
}
interpreterGroupReference.put(getInterpreterGroupKey(interpreterGroup),
new RemoteInterpreterProcess(interpreterRunner,
interpreterPath, env, interpreterContextRunnerPool));
logger.info("setInterpreterGroup = "
+ getInterpreterGroupKey(interpreterGroup) + " class=" + className
+ ", path=" + interpreterPath);
}
}

21
zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
View file

@ -457,4 +457,25 @@ public class RemoteInterpreterTest {
intpA.close();
}
@Test
public void testProcessCreation() {
Properties p = new Properties();
RemoteInterpreter intpA = new RemoteInterpreter(
p,
MockInterpreterA.class.getName(),
new File("../bin/interpreter.sh").getAbsolutePath(),
"fake",
env
);
intpA.setInterpreterGroup(intpGroup);
RemoteInterpreterProcess processA = intpA.getInterpreterProcess();
intpA.setInterpreterGroup(new InterpreterGroup(intpA.getInterpreterGroup().getId()));
RemoteInterpreterProcess processB = intpA.getInterpreterProcess();
assertEquals(processA.hashCode(), processB.hashCode());
}
}

109
zeppelin-server/pom.xml
View file

@ -22,13 +22,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-server</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Server</name>
<url>http://www.nflabs.com</url>
@ -67,13 +67,13 @@
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
<version>1.3.0</version>
</dependency>
<!-- Swagger -->
<!-- Swagger -->
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-jersey-jaxrs_2.10</artifactId>
@ -177,7 +177,7 @@
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId>
<version>2.2.0.v201112011158</version>
<exclusions>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
@ -207,7 +207,7 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</exclusions>
</dependency>
<dependency>
@ -259,29 +259,29 @@
<exclusion>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</exclusion>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0-m10</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0-m10</version>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@ -320,7 +320,7 @@
</goals>
</execution>
</executions>
<configuration>
<configuration>
<argLine>-Xmx2048m</argLine>
</configuration>
</plugin>
@ -335,38 +335,39 @@
</plugin>
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<executions>
<execution>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<stderr/>
<systemProperties>
<spark.testing>1</spark.testing>
</systemProperties>
</configuration>
<executions>
<execution>
<id>test</id>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0</version>
<configuration>
<stderr/>
<systemProperties>
<spark.testing>1</spark.testing>
</systemProperties>
</configuration>
<executions>
<execution>
<id>test</id>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>

5
zeppelin-web/app/styles/notebook.css
View file

@ -222,6 +222,11 @@
z-index:auto !important;
}
/** Force opacity:0 to textarea in writing texts **/
.ace_text-input.ace_composition {
opacity: 0 !important;
}
#main .emacs-mode .ace_cursor {
background-color:#C0C0C0!important;
border: none !important;

3
zeppelin-web/bower.json
View file

@ -30,9 +30,6 @@
"angular-scenario": "1.3.8"
},
"appPath": "app",
"resolutions": {
"perfect-scrollbar": "~0.5.4"
},
"overrides": {
"ace-builds": {
"main": ["src-noconflict/ace.js",

4
zeppelin-web/package.json
View file

@ -33,5 +33,9 @@
},
"engines": {
"node": ">=0.10.0"
},
"repository": {
"type": "git",
"url": "git@github.com:apache/incubator-zeppelin.git"
}
}

32
zeppelin-web/pom.xml
View file

@ -22,13 +22,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-web</artifactId>
<packaging>war</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: web Application</name>
<build>
@ -74,6 +74,7 @@
<artifactId>frontend-maven-plugin</artifactId>
<version>0.0.23</version>
<executions>
<execution>
<id>install node and npm</id>
<goals>
@ -90,10 +91,6 @@
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>install</arguments>
</configuration>
</execution>
<execution>
@ -101,7 +98,6 @@
<goals>
<goal>bower</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>--allow-root install</arguments>
</configuration>
@ -112,15 +108,33 @@
<goals>
<goal>grunt</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<!-- TODO(anthonycorbacho): remove force once all JSHint are fixed! -->
<arguments>--no-color --force</arguments>
</configuration>
</execution>
</executions>
</plugin>
<!--
Disabling test report generation as it forks the lifecycle
and results in https://issues.apache.org/jira/browse/ZEPPELIN-69
There is no better way to do it, as per
http://jira.codehaus.org/browse/MCOBERTURA-154
-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<executions>
<execution>
<id>cobertura</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

4
zeppelin-zengine/pom.xml
View file

@ -23,13 +23,13 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-zengine</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0-incubating-SNAPSHOT</version>
<name>Zeppelin: Zengine</name>
<description>Zeppelin Zengine</description>
<url>http://zeppelin.incubator.apache.org</url>