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

com.nflabs -> org.apache

Browse source
This commit is contained in:
Lee moon soo 2015-04-06 02:04:54 +09:00
parent 4d32d1971b
commit 42ee479fcd
19 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
View file

@ -465,8 +465,8 @@ public class SparkInterpreter extends Interpreter {
// add some implicit conversion
intp.interpret("implicit def watcherConversion(watcher: (Object, Object) => Unit):"
+ "com.nflabs.zeppelin.display.AngularObjectWatcher = {"
+ " new com.nflabs.zeppelin.display.AngularObjectWatcher() {"
+ "org.apache.zeppelin.display.AngularObjectWatcher = {"
+ " new org.apache.zeppelin.display.AngularObjectWatcher() {"
+ " def watch(before:Object, after:Object) = {"
+ " watcher(before, after)"
+ " }"

6
spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java
View file

@ -29,9 +29,9 @@ import java.util.Iterator;
import org.apache.spark.SparkContext;
import org.apache.spark.sql.SQLContext;
import org.apache.spark.sql.hive.HiveContext;
import com.nflabs.zeppelin.display.AngularObject;
import com.nflabs.zeppelin.display.AngularObjectRegistry;
import com.nflabs.zeppelin.display.AngularObjectWatcher;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.display.AngularObjectWatcher;
import org.apache.zeppelin.display.GUI;
import org.apache.zeppelin.display.Input.ParamOption;
import org.apache.zeppelin.interpreter.InterpreterContext;

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

@ -15,14 +15,14 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.display;
package org.apache.zeppelin.display;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import com.nflabs.zeppelin.scheduler.ExecutorFactory;
import org.apache.zeppelin.scheduler.ExecutorFactory;
/**
*

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

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

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

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

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

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

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

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

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

@ -21,7 +21,7 @@ import java.util.LinkedList;
import java.util.Properties;
import java.util.Random;
import com.nflabs.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.display.AngularObjectRegistry;
/**
* InterpreterGroup is list of interpreters in the same group.

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

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import com.nflabs.zeppelin.display.AngularObject;
import com.nflabs.zeppelin.display.AngularObjectListener;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectListener;
/**
*

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

@ -15,14 +15,14 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import com.nflabs.zeppelin.display.AngularObject;
import com.nflabs.zeppelin.display.AngularObjectRegistry;
import com.nflabs.zeppelin.display.AngularObjectRegistryListener;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.WrappedInterpreter;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.display.AngularObjectRegistryListener;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.WrappedInterpreter;
/**
*

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

@ -15,19 +15,19 @@
* limitations under the License.
*/
package com.nflabs.zeppelin.interpreter.remote;
package org.apache.zeppelin.interpreter.remote;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
import com.nflabs.zeppelin.display.AngularObject;
import com.nflabs.zeppelin.display.AngularObjectRegistry;
import com.nflabs.zeppelin.interpreter.InterpreterGroup;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterEvent;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterEventType;
import com.nflabs.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.interpreter.InterpreterGroup;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterEvent;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterEventType;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterService.Client;
/**
*

2
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/thrift/RemoteInterpreterEvent.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEvent.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/RemoteInterpreterEventType.java → zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/thrift/RemoteInterpreterEventType.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 java.util.Map;

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

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.nflabs.zeppelin.scheduler;
package org.apache.zeppelin.scheduler;
import java.util.HashMap;
import java.util.Map;

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

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

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

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

18
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/interpreter/remote/RemoteAngularObjectTest.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/RemoteAngularObjectTest.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;
@ -28,14 +28,14 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.nflabs.zeppelin.display.AngularObject;
import com.nflabs.zeppelin.display.AngularObjectRegistry;
import com.nflabs.zeppelin.display.AngularObjectRegistryListener;
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.mock.MockInterpreterAngular;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.display.AngularObjectRegistryListener;
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.remote.mock.MockInterpreterAngular;
public class RemoteAngularObjectTest implements AngularObjectRegistryListener {
private InterpreterGroup intpGroup;

18
zeppelin-interpreter/src/test/java/com/nflabs/zeppelin/interpreter/remote/mock/MockInterpreterAngular.java → zeppelin-interpreter/src/test/java/org/apache/zeppelin/interpreter/remote/mock/MockInterpreterAngular.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 java.util.concurrent.atomic.AtomicInteger;
import com.nflabs.zeppelin.display.AngularObjectRegistry;
import com.nflabs.zeppelin.display.AngularObjectWatcher;
import com.nflabs.zeppelin.interpreter.Interpreter;
import com.nflabs.zeppelin.interpreter.InterpreterContext;
import com.nflabs.zeppelin.interpreter.InterpreterPropertyBuilder;
import com.nflabs.zeppelin.interpreter.InterpreterResult;
import com.nflabs.zeppelin.interpreter.InterpreterResult.Code;
import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.display.AngularObjectWatcher;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
public class MockInterpreterAngular extends Interpreter implements AngularObjectWatcher {
static {
@ -112,4 +112,4 @@ public class MockInterpreterAngular extends Interpreter implements AngularObject
numWatch.incrementAndGet();
}
}
}

2
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file

@ -455,7 +455,7 @@ public class NotebookServer extends WebSocketServer implements
AngularObjectRegistry angularObjectRegistry = setting
.getInterpreterGroup().getAngularObjectRegistry();
AngularObject ao = angularObjectRegistry.get(varName);
this.broadcast(n.id(), new Message(OP.ANGULAR_OBJECT_UPDATE)
this.broadcast(n.id(), new Message(OP.ANGULAR_OBJECT_UPDATE)
.put("angularObject", ao)
.put("interpreterGroupId", interpreterGroupId)
.put("noteId", n.id()));