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

Apply rat plugin and com.nflabs -> org.apache

Browse source
This commit is contained in:
Lee moon soo 2015-03-30 17:21:58 +09:00
parent 5edc77bc98
commit 5faf7b1c41
116 changed files with 427 additions and 467 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/interpreter.sh
View file

@ -55,7 +55,7 @@ addJarInDir "${INTERPRETER_DIR}"
export CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
HOSTNAME=$(hostname)
ZEPPELIN_SERVER=com.nflabs.zeppelin.interpreter.remote.RemoteInterpreterServer
ZEPPELIN_SERVER=org.apache.zeppelin.interpreter.remote.RemoteInterpreterServer
INTERPRETER_ID=$(basename "${INTERPRETER_DIR}")
ZEPPELIN_PID="${ZEPPELIN_PID_DIR}/zeppelin-interpreter-${INTERPRETER_ID}-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.pid"

2
bin/zeppelin-daemon.sh
View file

@ -51,7 +51,7 @@ ZEPPELIN_NAME="Zeppelin"
ZEPPELIN_LOGFILE="${ZEPPELIN_LOG_DIR}/zeppelin-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.log"
ZEPPELIN_OUTFILE="${ZEPPELIN_LOG_DIR}/zeppelin-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.out"
ZEPPELIN_PID="${ZEPPELIN_PID_DIR}/zeppelin-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.pid"
ZEPPELIN_MAIN=com.nflabs.zeppelin.server.ZeppelinServer
ZEPPELIN_MAIN=org.apache.zeppelin.server.ZeppelinServer
JAVA_OPTS+=" -Dzeppelin.log.file=${ZEPPELIN_LOGFILE}"
if [[ "${ZEPPELIN_NICENESS}" = "" ]]; then

2
bin/zeppelin.sh
View file

@ -48,7 +48,7 @@ HOSTNAME=$(hostname)
ZEPPELIN_LOGFILE="${ZEPPELIN_LOG_DIR}/zeppelin-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.log"
LOG="${ZEPPELIN_LOG_DIR}/zeppelin-cli-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.out"
ZEPPELIN_SERVER=com.nflabs.zeppelin.server.ZeppelinServer
ZEPPELIN_SERVER=org.apache.zeppelin.server.ZeppelinServer
JAVA_OPTS+=" -Dzeppelin.log.file=${ZEPPELIN_LOGFILE}"
if [[ ! -d "${ZEPPELIN_LOG_DIR}" ]]; then

2
conf/zeppelin-site.xml.template
View file

@ -48,7 +48,7 @@
<property>
<name>zeppelin.interpreters</name>
<value>com.nflabs.zeppelin.spark.SparkInterpreter,com.nflabs.zeppelin.spark.PySparkInterpreter,com.nflabs.zeppelin.spark.SparkSqlInterpreter,com.nflabs.zeppelin.spark.DepInterpreter,com.nflabs.zeppelin.markdown.Markdown,com.nflabs.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter</value>
<value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter</value>
<description>Comma separated interpreter configurations. First interpreter become a default</description>
</property>

6
markdown/pom.xml
View file

@ -21,16 +21,16 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
</parent>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-markdown</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<name>Zeppelin: Markdown interpreter</name>
<url>http://www.nflabs.com</url>
<url>http://zeppelin.incubator.apache.org</url>
<dependencies>
<dependency>

17
markdown/src/main/java/com/nflabs/zeppelin/markdown/Markdown.java → markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java
View file

@ -15,22 +15,21 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.markdown;
package org.apache.zeppelin.markdown;
import java.io.IOException;
import java.util.List;
import java.util.Properties;
import com.nflabs.zeppelin.interpreter.InterpreterUtils;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.interpreter.InterpreterUtils;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.markdown4j.Markdown4jProcessor;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
/**
* Markdown interpreter for Zeppelin.
*

6
markdown/src/test/java/com/nflabs/zeppelin/markdown/MarkdownTest.java → markdown/src/test/java/org/apache/zeppelin/markdown/MarkdownTest.java
View file

@ -15,18 +15,18 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.markdown;
package org.apache.zeppelin.markdown;
import static org.junit.Assert.assertEquals;
import java.util.Properties;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.markdown.Markdown;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
public class MarkdownTest {
@Before

11
pom.xml
View file

@ -32,7 +32,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin</artifactId>
<packaging>pom</packaging>
<version>0.5.0-SNAPSHOT</version>
@ -55,9 +55,9 @@
</licenses>
<scm>
<url>http://www.github.com/NFLabs/zeppelin</url>
<connection>scm:git:git:git@github.com:NFLabs/zeppelin.git</connection>
<developerConnection>scm:git:git@github.com:NFLabs/zeppelin.git</developerConnection>
<url>http://zeppelin.incubator.apache.org</url>
<connection>scm:git:git:git@github.com:apache/incubator-zeppelin.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-zeppelin.git</developerConnection>
</scm>
<developers>
@ -920,7 +920,7 @@
</goals>
<configuration>
<failOnViolation>true</failOnViolation>
<excludes>com/nflabs/zeppelin/interpreter/thrift/*</excludes>
<excludes>org/apache/zeppelin/interpreter/thrift/*</excludes>
</configuration>
</execution>
</executions>
@ -1071,6 +1071,7 @@
<exclude>**/run/**</exclude>
<exclude>**/interpreter/**</exclude>
<exclude>**/local-repo/**</exclude>
<exclude>**/null/**</exclude>
<exclude>**/notebook/**</exclude>
<exclude>_tools/site/css/*</exclude>
<exclude>**/README.md</exclude>

6
shell/pom.xml
View file

@ -21,16 +21,16 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
</parent>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-shell</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>
<name>Zeppelin: Shell interpreter</name>
<url>http://www.nflabs.com</url>
<url>http://zeppelin.incubator.apache.org</url>
<dependencies>
<dependency>

15
shell/src/main/java/com/nflabs/zeppelin/shell/ShellInterpreter.java → shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.shell;
package org.apache.zeppelin.shell;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -27,16 +27,15 @@ import org.apache.commons.exec.DefaultExecutor;
import org.apache.commons.exec.ExecuteException;
import org.apache.commons.exec.ExecuteWatchdog;
import org.apache.commons.exec.PumpStreamHandler;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
/**
* Shell interpreter for Zeppelin.
*

1
spark/pom.xml
View file

@ -25,6 +25,7 @@
<version>0.5.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-spark</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>

23
spark/src/main/java/com/nflabs/zeppelin/spark/DepInterpreter.java → spark/src/main/java/org/apache/zeppelin/spark/DepInterpreter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark;
package org.apache.zeppelin.spark;
import java.io.ByteArrayOutputStream;
import java.io.File;
@ -32,6 +32,15 @@ import java.util.Properties;
import org.apache.spark.repl.SparkILoop;
import org.apache.spark.repl.SparkIMain;
import org.apache.spark.repl.SparkJLineCompletion;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.interpreter.WrappedInterpreter;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.spark.dep.DependencyContext;
import org.sonatype.aether.resolution.ArtifactResolutionException;
import org.sonatype.aether.resolution.DependencyResolutionException;
@ -44,16 +53,6 @@ import scala.tools.nsc.interpreter.Completion.ScalaCompleter;
import scala.tools.nsc.settings.MutableSettings.BooleanSetting;
import scala.tools.nsc.settings.MutableSettings.PathSetting;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.InterpreterPropertyBuilder;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import com.nflabs.zeppelin.interpreter.WrappedInterpreter;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.spark.dep.DependencyContext;
/**
* DepInterpreter downloads dependencies and pass them when SparkInterpreter initialized.
@ -155,7 +154,7 @@ public class DepInterpreter extends Interpreter {
binder.put("depc", depc);
intp.interpret("@transient val z = "
+ "_binder.get(\"depc\").asInstanceOf[com.nflabs.zeppelin.spark.dep.DependencyContext]");
+ "_binder.get(\"depc\").asInstanceOf[org.apache.zeppelin.spark.dep.DependencyContext]");
}

21
spark/src/main/java/com/nflabs/zeppelin/spark/PySparkInterpreter.java → spark/src/main/java/org/apache/zeppelin/spark/PySparkInterpreter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark;
package org.apache.zeppelin.spark;
import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
@ -42,21 +42,20 @@ import org.apache.commons.exec.environment.EnvironmentUtils;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.LazyOpenInterpreter;
import org.apache.zeppelin.interpreter.WrappedInterpreter;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import py4j.GatewayServer;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterException;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.InterpreterPropertyBuilder;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import com.nflabs.zeppelin.interpreter.LazyOpenInterpreter;
import com.nflabs.zeppelin.interpreter.WrappedInterpreter;
/**
*
*/

24
spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java → spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark;
package org.apache.zeppelin.spark;
import java.io.ByteArrayOutputStream;
import java.io.File;
@ -32,7 +32,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import com.nflabs.zeppelin.interpreter.*;
import org.apache.spark.HttpServer;
import org.apache.spark.SparkConf;
import org.apache.spark.SparkContext;
@ -47,6 +46,19 @@ import org.apache.spark.scheduler.Pool;
import org.apache.spark.scheduler.Stage;
import org.apache.spark.sql.SQLContext;
import org.apache.spark.ui.jobs.JobProgressListener;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.interpreter.InterpreterUtils;
import org.apache.zeppelin.interpreter.WrappedInterpreter;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.apache.zeppelin.spark.dep.DependencyContext;
import org.apache.zeppelin.spark.dep.DependencyResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -66,12 +78,6 @@ import scala.tools.nsc.interpreter.Completion.ScalaCompleter;
import scala.tools.nsc.settings.MutableSettings.BooleanSetting;
import scala.tools.nsc.settings.MutableSettings.PathSetting;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
import com.nflabs.zeppelin.spark.dep.DependencyContext;
import com.nflabs.zeppelin.spark.dep.DependencyResolver;
/**
* Spark interpreter for Zeppelin.
*
@ -419,7 +425,7 @@ public class SparkInterpreter extends Interpreter {
binder.put("out", printStream);
intp.interpret("@transient val z = "
+ "_binder.get(\"z\").asInstanceOf[com.nflabs.zeppelin.spark.ZeppelinContext]");
+ "_binder.get(\"z\").asInstanceOf[org.apache.zeppelin.spark.ZeppelinContext]");
intp.interpret("@transient val sc = "
+ "_binder.get(\"sc\").asInstanceOf[org.apache.spark.SparkContext]");
intp.interpret("@transient val sqlc = "

18
spark/src/main/java/com/nflabs/zeppelin/spark/SparkSqlInterpreter.java → spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark;
package org.apache.zeppelin.spark;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@ -24,7 +24,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import com.nflabs.zeppelin.interpreter.*;
import org.apache.spark.SparkContext;
import org.apache.spark.scheduler.ActiveJob;
import org.apache.spark.scheduler.DAGScheduler;
@ -33,6 +32,17 @@ import org.apache.spark.sql.SQLContext;
import org.apache.spark.sql.SQLContext.QueryExecution;
import org.apache.spark.sql.catalyst.expressions.Attribute;
import org.apache.spark.ui.jobs.JobProgressListener;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterUtils;
import org.apache.zeppelin.interpreter.LazyOpenInterpreter;
import org.apache.zeppelin.interpreter.WrappedInterpreter;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -43,10 +53,6 @@ import scala.collection.JavaConverters;
import scala.collection.mutable.HashMap;
import scala.collection.mutable.HashSet;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
/**
* Spark SQL interpreter for Zeppelin.
*

11
spark/src/main/java/com/nflabs/zeppelin/spark/ZeppelinContext.java → spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark;
package org.apache.zeppelin.spark;
import static scala.collection.JavaConversions.asJavaCollection;
import static scala.collection.JavaConversions.asJavaIterable;
@ -29,15 +29,14 @@ import java.util.Iterator;
import org.apache.spark.SparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.spark.sql.hive.HiveContext;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.display.Input.ParamOption;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.spark.dep.DependencyResolver;
import scala.Tuple2;
import scala.collection.Iterable;
import com.nflabs.zeppelin.display.GUI;
import com.nflabs.zeppelin.display.Input.ParamOption;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.spark.dep.DependencyResolver;
/**
* Spark context for zeppelin.
*

2
spark/src/main/java/com/nflabs/zeppelin/spark/dep/Booter.java → spark/src/main/java/org/apache/zeppelin/spark/dep/Booter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
import java.io.File;

2
spark/src/main/java/com/nflabs/zeppelin/spark/dep/Dependency.java → spark/src/main/java/org/apache/zeppelin/spark/dep/Dependency.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
import java.util.LinkedList;
import java.util.List;

2
spark/src/main/java/com/nflabs/zeppelin/spark/dep/DependencyContext.java → spark/src/main/java/org/apache/zeppelin/spark/dep/DependencyContext.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
import java.io.File;
import java.net.MalformedURLException;

8
spark/src/main/java/com/nflabs/zeppelin/spark/dep/DependencyResolver.java → spark/src/main/java/org/apache/zeppelin/spark/dep/DependencyResolver.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
@ -79,9 +79,9 @@ public class DependencyResolver {
"org.scala-lang:scala-compiler",
"org.scala-lang:scala-reflect",
"org.scala-lang:scalap",
"com.nflabs.zeppelin:zeppelin-zengine",
"com.nflabs.zeppelin:zeppelin-spark",
"com.nflabs.zeppelin:zeppelin-server"};
"org.apache.zeppelin:zeppelin-zengine",
"org.apache.zeppelin:zeppelin-spark",
"org.apache.zeppelin:zeppelin-server"};
public DependencyResolver(SparkIMain intp, SparkContext sc, String localRepoPath) {
this.intp = intp;

2
spark/src/main/java/com/nflabs/zeppelin/spark/dep/Repository.java → spark/src/main/java/org/apache/zeppelin/spark/dep/Repository.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
/**
*

2
spark/src/main/java/com/nflabs/zeppelin/spark/dep/RepositoryListener.java → spark/src/main/java/org/apache/zeppelin/spark/dep/RepositoryListener.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
spark/src/main/java/com/nflabs/zeppelin/spark/dep/RepositorySystemFactory.java → spark/src/main/java/org/apache/zeppelin/spark/dep/RepositorySystemFactory.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
import org.apache.maven.repository.internal.DefaultServiceLocator;
import org.apache.maven.wagon.Wagon;

2
spark/src/main/java/com/nflabs/zeppelin/spark/dep/TransferListener.java → spark/src/main/java/org/apache/zeppelin/spark/dep/TransferListener.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
import java.io.PrintStream;
import java.text.DecimalFormat;

15
spark/src/test/java/com/nflabs/zeppelin/spark/DepInterpreterTest.java → spark/src/test/java/org/apache/zeppelin/spark/DepInterpreterTest.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark;
package org.apache.zeppelin.spark;
import static org.junit.Assert.assertEquals;
@ -23,16 +23,17 @@ import java.io.File;
import java.util.HashMap;
import java.util.Properties;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.spark.DepInterpreter;
import org.apache.zeppelin.spark.SparkInterpreter;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.nflabs.zeppelin.display.GUI;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
public class DepInterpreterTest {
private DepInterpreter dep;
private InterpreterContext context;

12
spark/src/test/java/com/nflabs/zeppelin/spark/SparkInterpreterTest.java → spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark;
package org.apache.zeppelin.spark;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@ -24,17 +24,17 @@ import java.io.File;
import java.util.HashMap;
import java.util.Properties;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.spark.SparkInterpreter;
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
import com.nflabs.zeppelin.display.GUI;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class SparkInterpreterTest {
public static SparkInterpreter repl;

15
spark/src/test/java/com/nflabs/zeppelin/spark/SparkSqlInterpreterTest.java → spark/src/test/java/org/apache/zeppelin/spark/SparkSqlInterpreterTest.java
View file

@ -15,23 +15,24 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark;
package org.apache.zeppelin.spark;
import static org.junit.Assert.assertEquals;
import java.util.HashMap;
import java.util.Properties;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Type;
import org.apache.zeppelin.spark.SparkInterpreter;
import org.apache.zeppelin.spark.SparkSqlInterpreter;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.nflabs.zeppelin.display.GUI;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Type;
public class SparkSqlInterpreterTest {
private SparkSqlInterpreter sql;

3
spark/src/test/java/com/nflabs/zeppelin/spark/dep/DependencyResolverTest.java → spark/src/test/java/org/apache/zeppelin/spark/dep/DependencyResolverTest.java
View file

@ -15,10 +15,11 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.spark.dep;
package org.apache.zeppelin.spark.dep;
import static org.junit.Assert.assertEquals;
import org.apache.zeppelin.spark.dep.DependencyResolver;
import org.junit.Test;
public class DependencyResolverTest {

2
zeppelin-distribution/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
</parent>

6
zeppelin-distribution/src/assemble/distribution.xml
View file

@ -33,9 +33,9 @@
<useAllReactorProjects>true</useAllReactorProjects> -->
<!-- Now, select which projects to include in this module-set. -->
<includes>
<include>com.nflabs.zeppelin:zeppelin-api-ui</include>
<include>com.nflabs.zeppelin:zeppelin-server</include>
<include>com.nflabs.zeppelin:zeppelin-web</include>
<include>org.apache.zeppelin:zeppelin-api-ui</include>
<include>org.apache.zeppelin:zeppelin-server</include>
<include>org.apache.zeppelin:zeppelin-web</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>

4
zeppelin-interpreter/pom.xml
View file

@ -22,11 +22,11 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
</parent>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-interpreter</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>

41
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterUtils.java
View file

@ -1,41 +0,0 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
import java.lang.reflect.InvocationTargetException;
/**
* Interpreter utility functions
*/
public class InterpreterUtils {
public static String getMostRelevantMessage(Exception ex) {
if (ex instanceof InvocationTargetException) {
Throwable cause = ((InvocationTargetException) ex).getCause();
if (cause != null) {
return cause.getMessage();
}
}
String message = ex.getMessage();
if (message == null || message == "") {
return ex.toString();
}
return message;
}
}

4
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/display/GUI.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java
View file

@ -15,14 +15,14 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.display;
package org.apache.zeppelin.display;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
import com.nflabs.zeppelin.display.Input.ParamOption;
import org.apache.zeppelin.display.Input.ParamOption;
/**
* Settings of a form.

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/display/Input.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.display;
package org.apache.zeppelin.display;
import java.io.Serializable;
import java.util.ArrayList;

4
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/ClassloaderInterpreter.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/ClassloaderInterpreter.java
View file

@ -15,13 +15,13 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.net.URL;
import java.util.List;
import java.util.Properties;
import com.nflabs.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.Scheduler;
/**
* Add to the classpath interpreters.

7
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/Interpreter.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.net.URL;
@ -25,12 +25,11 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
/**
* Interface for interpreters.
* If you want to implement new Zeppelin interpreter, extend this class

4
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterContext.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java
View file

@ -15,11 +15,11 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.util.Map;
import com.nflabs.zeppelin.display.GUI;
import org.apache.zeppelin.display.GUI;
/**
* Interpreter context

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterException.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterException.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
/**
* Runtime Exception for interpreters.

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterGroup.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.util.LinkedList;
import java.util.Properties;

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterProperty.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
/**
* Represent property of interpreter

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterPropertyBuilder.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterPropertyBuilder.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.util.HashMap;
import java.util.Map;

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterResult.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterResult.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.io.Serializable;

4
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/LazyOpenInterpreter.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/LazyOpenInterpreter.java
View file

@ -15,13 +15,13 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.net.URL;
import java.util.List;
import java.util.Properties;
import com.nflabs.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.Scheduler;
/**
* Interpreter wrapper for lazy initialization

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/WrappedInterpreter.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/WrappedInterpreter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
/**
* WrappedInterpreter

9
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/ClientFactory.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/ClientFactory.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import java.util.HashMap;
import java.util.Map;
@ -27,10 +27,9 @@ import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransportException;
import com.nflabs.zeppelin.interpreter.InterpreterException;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
/**
*

26
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreter.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import java.util.HashMap;
import java.util.List;
@ -23,23 +23,23 @@ import java.util.Map;
import java.util.Properties;
import org.apache.thrift.TException;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Type;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterContext;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterResult;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nflabs.zeppelin.display.GUI;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterException;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Type;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterContext;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterResult;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
/**
*

7
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterProcess.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcess.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import java.io.IOException;
import java.util.Map;
@ -28,12 +28,11 @@ import org.apache.commons.exec.ExecuteResultHandler;
import org.apache.commons.exec.ExecuteWatchdog;
import org.apache.commons.exec.environment.EnvironmentUtils;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nflabs.zeppelin.interpreter.InterpreterException;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
/**
*
*/

36
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import java.lang.reflect.Constructor;
@ -29,28 +29,28 @@ import org.apache.thrift.TException;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TTransportException;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.ClassloaderInterpreter;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.LazyOpenInterpreter;
import org.apache.zeppelin.interpreter.Interpreter.FormType;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterContext;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterResult;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.JobListener;
import org.apache.zeppelin.scheduler.JobProgressPoller;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.Job.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nflabs.zeppelin.display.GUI;
import com.nflabs.zeppelin.interpreter.ClassloaderInterpreter;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.Interpreter.FormType;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterContext;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterResult;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterException;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.LazyOpenInterpreter;
import com.nflabs.zeppelin.scheduler.Job;
import com.nflabs.zeppelin.scheduler.JobListener;
import com.nflabs.zeppelin.scheduler.JobProgressPoller;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.Job.Status;
/**

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterUtils.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtils.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import java.io.IOException;
import java.net.InetSocketAddress;

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/thrift/RemoteInterpreterContext.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterContext.java
View file

@ -4,7 +4,7 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.nflabs.zeppelin.interpreter.thrift;
package org.apache.zeppelin.interpreter.thrift;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/thrift/RemoteInterpreterResult.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterResult.java
View file

@ -4,7 +4,7 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.nflabs.zeppelin.interpreter.thrift;
package org.apache.zeppelin.interpreter.thrift;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/thrift/RemoteInterpreterService.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterService.java
View file

@ -4,7 +4,7 @@
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
*/
package com.nflabs.zeppelin.interpreter.thrift;
package org.apache.zeppelin.interpreter.thrift;
import org.apache.thrift.scheme.IScheme;
import org.apache.thrift.scheme.SchemeFactory;

4
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/FIFOScheduler.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/FIFOScheduler.java
View file

@ -15,14 +15,14 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import com.nflabs.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.scheduler.Job.Status;
/**
* TODO(moon) : add description.

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/Job.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import java.text.SimpleDateFormat;
import java.util.Date;

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/JobListener.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
/**
* TODO(moon) : add description.

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/JobProgressPoller.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/ParallelScheduler.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/ParallelScheduler.java
View file

@ -15,14 +15,14 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import com.nflabs.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.scheduler.Job.Status;
/**
* TODO(moon) : add description.

9
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/RemoteScheduler.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/RemoteScheduler.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import java.util.Collection;
import java.util.LinkedList;
@ -23,13 +23,12 @@ import java.util.List;
import java.util.concurrent.ExecutorService;
import org.apache.thrift.TException;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
import org.apache.zeppelin.scheduler.Job.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreterProcess;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
import com.nflabs.zeppelin.scheduler.Job.Status;
/**
*
*/

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/Scheduler.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Scheduler.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import java.util.Collection;

5
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/SchedulerFactory.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import java.util.Collection;
import java.util.LinkedHashMap;
@ -25,11 +25,10 @@ import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreterProcess;
/**
* TODO(moon) : add description.
*

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/scheduler/SchedulerListener.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
/**
* TODO(moon) : add description.

2
zeppelin-interpreter/src/main/thrift/RemoteInterpreterService.thrift
View file

@ -16,7 +16,7 @@
* limitations under the License.
*/
namespace java com.nflabs.zeppelin.interpreter.thrift
namespace java org.apache.zeppelin.interpreter.thrift
struct RemoteInterpreterContext {

2
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/display/InputTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/display/InputTest.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.display;
package org.apache.zeppelin.display;
import java.io.IOException;

7
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterProcessTest.java
View file

@ -15,18 +15,17 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import java.util.HashMap;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
import org.junit.Test;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreterProcess;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
public class RemoteInterpreterProcessTest {
@Test

7
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServerTest.java
View file

@ -15,20 +15,19 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
import org.apache.thrift.TException;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterServer;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreterServer;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreterUtils;
public class RemoteInterpreterServerTest {
@Before
public void setUp() throws Exception {

25
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterTest.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -30,22 +30,21 @@ import java.util.Map;
import java.util.Properties;
import org.apache.thrift.transport.TTransportException;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterProcess;
import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterA;
import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterB;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.Job.Status;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.nflabs.zeppelin.display.GUI;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreter;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreterProcess;
import com.nflabs.zeppelin.interpreter.remote.mock.MockInterpreterA;
import com.nflabs.zeppelin.interpreter.remote.mock.MockInterpreterB;
import com.nflabs.zeppelin.scheduler.Job;
import com.nflabs.zeppelin.scheduler.Job.Status;
import com.nflabs.zeppelin.scheduler.Scheduler;
public class RemoteInterpreterTest {

5
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterUtilsTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterUtilsTest.java
View file

@ -15,16 +15,15 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreterUtils;
import org.junit.Test;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreterUtils;
public class RemoteInterpreterUtilsTest {
@Test

18
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/interpreter/remote/mock/MockInterpreterA.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterA.java
View file

@ -15,19 +15,19 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote.mock;
package org.apache.zeppelin.interpreter.remote.mock;
import java.util.List;
import java.util.Properties;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterException;
import com.nflabs.zeppelin.interpreter.InterpreterPropertyBuilder;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
public class MockInterpreterA extends Interpreter {
static {

20
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/interpreter/remote/mock/MockInterpreterB.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterB.java
View file

@ -15,20 +15,20 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote.mock;
package org.apache.zeppelin.interpreter.remote.mock;
import java.util.List;
import java.util.Properties;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterException;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.InterpreterPropertyBuilder;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import com.nflabs.zeppelin.interpreter.WrappedInterpreter;
import com.nflabs.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.interpreter.WrappedInterpreter;
import org.apache.zeppelin.scheduler.Scheduler;
public class MockInterpreterB extends Interpreter {
static {

10
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/scheduler/FIFOSchedulerTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/FIFOSchedulerTest.java
View file

@ -15,12 +15,12 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import com.nflabs.zeppelin.scheduler.Job;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
import com.nflabs.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.apache.zeppelin.scheduler.Job.Status;
import junit.framework.TestCase;

10
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/scheduler/ParallelSchedulerTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/ParallelSchedulerTest.java
View file

@ -15,13 +15,13 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import com.nflabs.zeppelin.scheduler.Job;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
import com.nflabs.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.apache.zeppelin.scheduler.Job.Status;
import junit.framework.TestCase;
public class ParallelSchedulerTest extends TestCase {

19
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/scheduler/RemoteSchedulerTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/RemoteSchedulerTest.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import static org.junit.Assert.assertEquals;
@ -24,19 +24,18 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.apache.zeppelin.interpreter.remote.mock.MockInterpreterA;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.nflabs.zeppelin.display.GUI;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreter;
import com.nflabs.zeppelin.interpreter.remote.mock.MockInterpreterA;
import com.nflabs.zeppelin.scheduler.Job;
import com.nflabs.zeppelin.scheduler.Scheduler;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
public class RemoteSchedulerTest {
private SchedulerFactory schedulerSvc;

6
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/scheduler/SleepingJob.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/scheduler/SleepingJob.java
View file

@ -15,13 +15,13 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import java.util.HashMap;
import java.util.Map;
import com.nflabs.zeppelin.scheduler.Job;
import com.nflabs.zeppelin.scheduler.JobListener;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.JobListener;
public class SleepingJob extends Job{

4
zeppelin-server/pom.xml
View file

@ -21,11 +21,11 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
</parent>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-server</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>

18
zeppelin-server/src/main/java/com/nflabs/zeppelin/rest/InterpreterRestApi.java → zeppelin-server/src/main/java/org/apache/zeppelin/rest/InterpreterRestApi.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest;
package org.apache.zeppelin.rest;
import java.io.IOException;
import java.util.List;
@ -32,18 +32,18 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterFactory;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.interpreter.Interpreter.RegisteredInterpreter;
import org.apache.zeppelin.rest.message.NewInterpreterSettingRequest;
import org.apache.zeppelin.rest.message.UpdateInterpreterSettingRequest;
import org.apache.zeppelin.server.JsonResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.Interpreter.RegisteredInterpreter;
import com.nflabs.zeppelin.interpreter.InterpreterException;
import com.nflabs.zeppelin.interpreter.InterpreterFactory;
import com.nflabs.zeppelin.interpreter.InterpreterSetting;
import com.nflabs.zeppelin.rest.message.NewInterpreterSettingRequest;
import com.nflabs.zeppelin.rest.message.UpdateInterpreterSettingRequest;
import com.nflabs.zeppelin.server.JsonResponse;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiResponse;

2
zeppelin-server/src/main/java/com/nflabs/zeppelin/rest/NotebookResponse.java → zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookResponse.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest;
package org.apache.zeppelin.rest;
import javax.xml.bind.annotation.XmlRootElement;

10
zeppelin-server/src/main/java/com/nflabs/zeppelin/rest/NotebookRestApi.java → zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest;
package org.apache.zeppelin.rest;
import java.io.IOException;
import java.util.LinkedList;
@ -29,15 +29,15 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.apache.zeppelin.notebook.Notebook;
import org.apache.zeppelin.rest.message.InterpreterSettingListForNoteBind;
import org.apache.zeppelin.server.JsonResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nflabs.zeppelin.interpreter.InterpreterSetting;
import com.nflabs.zeppelin.notebook.Notebook;
import com.nflabs.zeppelin.rest.message.InterpreterSettingListForNoteBind;
import com.nflabs.zeppelin.server.JsonResponse;
/**
* Rest api endpoint for the noteBook.

2
zeppelin-server/src/main/java/com/nflabs/zeppelin/rest/ZeppelinRestApi.java → zeppelin-server/src/main/java/org/apache/zeppelin/rest/ZeppelinRestApi.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest;
package org.apache.zeppelin.rest;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

4
zeppelin-server/src/main/java/com/nflabs/zeppelin/rest/message/InterpreterSettingListForNoteBind.java → zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/InterpreterSettingListForNoteBind.java
View file

@ -15,11 +15,11 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest.message;
package org.apache.zeppelin.rest.message;
import java.util.List;
import com.nflabs.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.Interpreter;
/**
* InterpreterSetting information for binding

4
zeppelin-server/src/main/java/com/nflabs/zeppelin/rest/message/NewInterpreterSettingRequest.java → zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/NewInterpreterSettingRequest.java
View file

@ -15,11 +15,11 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest.message;
package org.apache.zeppelin.rest.message;
import java.util.Map;
import com.nflabs.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.InterpreterOption;
/**
* NewInterpreterSetting rest api request message

4
zeppelin-server/src/main/java/com/nflabs/zeppelin/rest/message/UpdateInterpreterSettingRequest.java → zeppelin-server/src/main/java/org/apache/zeppelin/rest/message/UpdateInterpreterSettingRequest.java
View file

@ -15,11 +15,11 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest.message;
package org.apache.zeppelin.rest.message;
import java.util.Properties;
import com.nflabs.zeppelin.interpreter.InterpreterOption;
import org.apache.zeppelin.interpreter.InterpreterOption;
/**
*

2
zeppelin-server/src/main/java/com/nflabs/zeppelin/server/AppScriptServlet.java → zeppelin-server/src/main/java/org/apache/zeppelin/server/AppScriptServlet.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.server;
package org.apache.zeppelin.server;
import java.io.IOException;
import java.io.InputStream;

2
zeppelin-server/src/main/java/com/nflabs/zeppelin/server/CorsFilter.java → zeppelin-server/src/main/java/org/apache/zeppelin/server/CorsFilter.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.server;
package org.apache.zeppelin.server;
import java.io.IOException;
import java.text.DateFormat;

7
zeppelin-server/src/main/java/com/nflabs/zeppelin/server/JsonResponse.java → zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java
View file

@ -15,17 +15,18 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.server;
package org.apache.zeppelin.server;
import java.util.ArrayList;
import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response.ResponseBuilder;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterSerializer;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterSerializer;
/**
* Json response builder.

22
zeppelin-server/src/main/java/com/nflabs/zeppelin/server/ZeppelinServer.java → zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.server;
package org.apache.zeppelin.server;
import java.io.File;
import java.io.IOException;
@ -28,6 +28,16 @@ import javax.servlet.DispatcherType;
import javax.ws.rs.core.Application;
import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
import org.apache.zeppelin.interpreter.InterpreterFactory;
import org.apache.zeppelin.notebook.Notebook;
import org.apache.zeppelin.rest.InterpreterRestApi;
import org.apache.zeppelin.rest.NotebookRestApi;
import org.apache.zeppelin.rest.ZeppelinRestApi;
import org.apache.zeppelin.scheduler.SchedulerFactory;
import org.apache.zeppelin.socket.NotebookServer;
import org.apache.zeppelin.socket.SslWebSocketServerFactory;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.bio.SocketConnector;
@ -42,16 +52,6 @@ import org.eclipse.jetty.webapp.WebAppContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nflabs.zeppelin.conf.ZeppelinConfiguration;
import com.nflabs.zeppelin.conf.ZeppelinConfiguration.ConfVars;
import com.nflabs.zeppelin.interpreter.InterpreterFactory;
import com.nflabs.zeppelin.notebook.Notebook;
import com.nflabs.zeppelin.rest.InterpreterRestApi;
import com.nflabs.zeppelin.rest.NotebookRestApi;
import com.nflabs.zeppelin.rest.ZeppelinRestApi;
import com.nflabs.zeppelin.scheduler.SchedulerFactory;
import com.nflabs.zeppelin.socket.NotebookServer;
import com.nflabs.zeppelin.socket.SslWebSocketServerFactory;
import com.wordnik.swagger.jersey.config.JerseyJaxrsConfig;
/**

2
zeppelin-server/src/main/java/com/nflabs/zeppelin/socket/Message.java → zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.socket;
package org.apache.zeppelin.socket;
import java.util.HashMap;
import java.util.Map;

22
zeppelin-server/src/main/java/com/nflabs/zeppelin/socket/NotebookServer.java → zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.socket;
package org.apache.zeppelin.socket;
import java.io.IOException;
import java.net.InetSocketAddress;
@ -25,7 +25,16 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.notebook.JobListenerFactory;
import org.apache.zeppelin.notebook.Note;
import org.apache.zeppelin.notebook.Notebook;
import org.apache.zeppelin.notebook.Paragraph;
import org.apache.zeppelin.scheduler.Job;
import org.apache.zeppelin.scheduler.JobListener;
import org.apache.zeppelin.scheduler.Job.Status;
import org.apache.zeppelin.server.ZeppelinServer;
import org.apache.zeppelin.socket.Message.OP;
import org.java_websocket.WebSocket;
import org.java_websocket.handshake.ClientHandshake;
import org.java_websocket.server.WebSocketServer;
@ -35,15 +44,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Strings;
import com.google.gson.Gson;
import com.nflabs.zeppelin.notebook.JobListenerFactory;
import com.nflabs.zeppelin.notebook.Note;
import com.nflabs.zeppelin.notebook.Notebook;
import com.nflabs.zeppelin.notebook.Paragraph;
import com.nflabs.zeppelin.scheduler.Job;
import com.nflabs.zeppelin.scheduler.Job.Status;
import com.nflabs.zeppelin.scheduler.JobListener;
import com.nflabs.zeppelin.server.ZeppelinServer;
import com.nflabs.zeppelin.socket.Message.OP;
/**
* Zeppelin websocket service.

2
zeppelin-server/src/main/java/com/nflabs/zeppelin/socket/SslWebSocketServerFactory.java → zeppelin-server/src/main/java/org/apache/zeppelin/socket/SslWebSocketServerFactory.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.socket;
package org.apache.zeppelin.socket;
import java.io.IOException;
import java.nio.channels.ByteChannel;

2
zeppelin-server/src/test/java/com/nflabs/zeppelin/ZeppelinIT.java → zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin;
package org.apache.zeppelin;
import static org.junit.Assert.fail;

4
zeppelin-server/src/test/java/com/nflabs/zeppelin/rest/AbstractTestRestApi.java → zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest;
package org.apache.zeppelin.rest;
import java.io.IOException;
import java.lang.ref.WeakReference;
@ -28,6 +28,7 @@ import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.RequestEntity;
import org.apache.zeppelin.server.ZeppelinServer;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
@ -37,7 +38,6 @@ import org.slf4j.LoggerFactory;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;
import com.nflabs.zeppelin.server.ZeppelinServer;
public abstract class AbstractTestRestApi {

6
zeppelin-server/src/test/java/com/nflabs/zeppelin/rest/ZeppelinRestApiTest.java → zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinRestApiTest.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.rest;
package org.apache.zeppelin.rest;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@ -26,6 +26,8 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.zeppelin.notebook.Note;
import org.apache.zeppelin.server.ZeppelinServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
@ -34,8 +36,6 @@ import org.junit.runners.MethodSorters;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.nflabs.zeppelin.notebook.Note;
import com.nflabs.zeppelin.server.ZeppelinServer;
/**
* BASIC Zeppelin rest api tests
* TODO: Add Post,Put,Delete test and method

2
zeppelin-server/src/test/resources/log4j.properties
View file

@ -33,7 +33,7 @@ log4j.logger.org.apache.hadoop.mapred=WARN
log4j.logger.org.apache.hadoop.hive.ql=WARN
log4j.logger.org.apache.hadoop.hive.metastore=WARN
log4j.logger.org.apache.haadoop.hive.service.HiveServer=WARN
log4j.logger.com.nflabs.zeppelin.scheduler=WARN
log4j.logger.org.apache.zeppelin.scheduler=WARN
log4j.logger.org.quartz=WARN
log4j.logger.DataNucleus=WARN

4
zeppelin-server/src/test/scala/com/nflabs/zeppelin/AbstractFunctionalSuite.scala → zeppelin-server/src/test/scala/org/apache/zeppelin/AbstractFunctionalSuite.scala
View file

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.nflabs.zeppelin
package org.apache.zeppelin
import com.nflabs.zeppelin.AbstractFunctionalSuite.SERVER_ADDRESS
import org.apache.zeppelin.AbstractFunctionalSuite.SERVER_ADDRESS
import org.openqa.selenium.WebDriver
import org.openqa.selenium.chrome.ChromeDriver
import org.openqa.selenium.firefox.{FirefoxBinary, FirefoxDriver, FirefoxProfile}

2
zeppelin-server/src/test/scala/com/nflabs/zeppelin/WelcomePageSuite.scala → zeppelin-server/src/test/scala/org/apache/zeppelin/WelcomePageSuite.scala
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin
package org.apache.zeppelin
import org.openqa.selenium.WebDriver
import org.scalatest.concurrent.Eventually._

2
zeppelin-web/app/WEB-INF/web.xml
View file

@ -26,7 +26,7 @@
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>com.nflabs.zeppelin.rest;com.wordnik.swagger.jersey.listing</param-value>
<param-value>org.apache.zeppelin.rest;com.wordnik.swagger.jersey.listing</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>

4
zeppelin-web/pom.xml
View file

@ -21,11 +21,11 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
</parent>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-web</artifactId>
<packaging>war</packaging>
<version>0.5.0-SNAPSHOT</version>

4
zeppelin-zengine/pom.xml
View file

@ -22,11 +22,11 @@
<parent>
<artifactId>zeppelin</artifactId>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<version>0.5.0-SNAPSHOT</version>
</parent>
<groupId>com.nflabs.zeppelin</groupId>
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-zengine</artifactId>
<packaging>jar</packaging>
<version>0.5.0-SNAPSHOT</version>

14
zeppelin-zengine/src/main/java/com/nflabs/zeppelin/conf/ZeppelinConfiguration.java → zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.conf;
package org.apache.zeppelin.conf;
import java.net.URL;
import java.util.List;
@ -370,12 +370,12 @@ public class ZeppelinConfiguration extends XMLConfiguration {
ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null),
ZEPPELIN_WAR("zeppelin.war", "../zeppelin-web/src/main/webapp"),
ZEPPELIN_API_WAR("zeppelin.api.war", "../zeppelin-docs/src/main/swagger"),
ZEPPELIN_INTERPRETERS("zeppelin.interpreters", "com.nflabs.zeppelin.spark.SparkInterpreter,"
+ "com.nflabs.zeppelin.spark.PySparkInterpreter,"
+ "com.nflabs.zeppelin.spark.SparkSqlInterpreter,"
+ "com.nflabs.zeppelin.spark.DepInterpreter,"
+ "com.nflabs.zeppelin.markdown.Markdown,"
+ "com.nflabs.zeppelin.shell.ShellInterpreter"),
ZEPPELIN_INTERPRETERS("zeppelin.interpreters", "org.apache.zeppelin.spark.SparkInterpreter,"
+ "org.apache.zeppelin.spark.PySparkInterpreter,"
+ "org.apache.zeppelin.spark.SparkSqlInterpreter,"
+ "org.apache.zeppelin.spark.DepInterpreter,"
+ "org.apache.zeppelin.markdown.Markdown,"
+ "org.apache.zeppelin.shell.ShellInterpreter"),
ZEPPELIN_INTERPRETER_DIR("zeppelin.interpreter.dir", "interpreter"),
ZEPPELIN_ENCODING("zeppelin.encoding", "UTF-8"),
ZEPPELIN_NOTEBOOK_DIR("zeppelin.notebook.dir", "notebook"),

10
zeppelin-zengine/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterFactory.java → zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.io.BufferedReader;
import java.io.File;
@ -41,15 +41,15 @@ import java.util.Properties;
import java.util.Set;
import org.apache.commons.lang.ArrayUtils;
import org.apache.zeppelin.conf.ZeppelinConfiguration;
import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
import org.apache.zeppelin.interpreter.Interpreter.RegisteredInterpreter;
import org.apache.zeppelin.interpreter.remote.RemoteInterpreter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.nflabs.zeppelin.conf.ZeppelinConfiguration;
import com.nflabs.zeppelin.conf.ZeppelinConfiguration.ConfVars;
import com.nflabs.zeppelin.interpreter.Interpreter.RegisteredInterpreter;
import com.nflabs.zeppelin.interpreter.remote.RemoteInterpreter;
/**
* Manage interpreters.

2
zeppelin-zengine/src/main/java/com/nflabs/zeppelin/interpreter/InterpreterInfoSaving.java → zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
View file

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter;
package org.apache.zeppelin.interpreter;
import java.util.List;
import java.util.Map;

Some files were not shown because too many files have changed in this diff Show more