You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lb...@apache.org on 2016/01/22 23:07:41 UTC
[33/51] [abbrv] incubator-toree git commit: Renamed com.ibm.spark to
org.apache.toree
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala
index 49582f8..77f0120 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommCloseHandlerSpec.scala
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.handler
+package org.apache.toree.kernel.protocol.v5.handler
import java.util.UUID
import akka.actor.{Props, ActorRef, ActorSystem}
import akka.testkit.{TestProbe, ImplicitSender, TestKit}
-import com.ibm.spark.kernel.protocol.v5
-import com.ibm.spark.kernel.protocol.v5.content.{ClearOutput, CommClose}
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
-import com.ibm.spark.kernel.protocol.v5.{KernelMessage, SystemActorType, KMBuilder}
-import com.ibm.spark.comm.{CommRegistrar, CommWriter, CommCallbacks, CommStorage}
+import org.apache.toree.kernel.protocol.v5
+import org.apache.toree.kernel.protocol.v5.content.{ClearOutput, CommClose}
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5.{KernelMessage, SystemActorType, KMBuilder}
+import org.apache.toree.comm.{CommRegistrar, CommWriter, CommCallbacks, CommStorage}
import org.scalatest.mock.MockitoSugar
import org.scalatest.{BeforeAndAfter, FunSpecLike, Matchers}
import org.mockito.Mockito._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala
index 582a08e..29e8dcf 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommMsgHandlerSpec.scala
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.handler
+package org.apache.toree.kernel.protocol.v5.handler
import java.util.UUID
import akka.actor.{ActorRef, ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import com.ibm.spark.kernel.protocol.v5
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.comm._
-import com.ibm.spark.kernel.protocol.v5.content.{CommMsg, ClearOutput, CommOpen}
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.comm._
+import org.apache.toree.kernel.protocol.v5.content.{CommMsg, ClearOutput, CommOpen}
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
import org.mockito.Matchers._
import org.mockito.Mockito._
import org.scalatest.mock.MockitoSugar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala
index 64013e9..ddf1893 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/CommOpenHandlerSpec.scala
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.handler
+package org.apache.toree.kernel.protocol.v5.handler
import java.util.UUID
-import com.ibm.spark.kernel.protocol.v5
+import org.apache.toree.kernel.protocol.v5
import akka.actor.{Props, ActorRef, ActorSystem}
import akka.testkit.{TestProbe, ImplicitSender, TestKit}
-import com.ibm.spark.kernel.protocol.v5.content.{CommClose, ClearOutput, CommOpen}
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.comm._
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5.content.{CommClose, ClearOutput, CommOpen}
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.comm._
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
import org.mockito.Mockito._
import org.mockito.Matchers._
import org.scalatest.mock.MockitoSugar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandlerSpec.scala
index c22bc41..f8532bd 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/ExecuteRequestHandlerSpec.scala
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.handler
+package org.apache.toree.kernel.protocol.v5.handler
import java.io.OutputStream
import java.util.concurrent.atomic.AtomicInteger
import akka.actor._
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import com.ibm.spark.kernel.api.{FactoryMethods, FactoryMethodsLike, Kernel}
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.content._
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
-import com.ibm.spark.kernel.protocol.v5Test._
+import org.apache.toree.kernel.api.{FactoryMethods, FactoryMethodsLike, Kernel}
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.content._
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5Test._
import org.scalatest.mock.MockitoSugar
import org.scalatest.{BeforeAndAfter, FunSpecLike, Matchers}
import play.api.libs.json.Json
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/GenericSocketMessageHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/GenericSocketMessageHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/GenericSocketMessageHandlerSpec.scala
index 54ebdc8..2df1c39 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/GenericSocketMessageHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/GenericSocketMessageHandlerSpec.scala
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.handler
+package org.apache.toree.kernel.protocol.v5.handler
import akka.actor.{ActorSystem, Props, ActorRef, ActorSelection}
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
-import com.ibm.spark.kernel.protocol.v5Test._
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5Test._
import org.mockito.Mockito._
import org.scalatest.mock.MockitoSugar
import org.scalatest.{Matchers, FunSpecLike, FunSpec}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala
index 57114bb..45bc197 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/InputRequestReplyHandlerSpec.scala
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.handler
+package org.apache.toree.kernel.protocol.v5.handler
import java.util.UUID
import java.util.concurrent.ConcurrentHashMap
import akka.actor.{Props, ActorRef, ActorSystem}
import akka.testkit.{TestProbe, ImplicitSender, TestKit}
-import com.ibm.spark.kernel.protocol.v5.content.InputReply
-import com.ibm.spark.kernel.protocol.v5.{HeaderBuilder, MessageType, KMBuilder, SystemActorType}
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5.content.InputReply
+import org.apache.toree.kernel.protocol.v5.{HeaderBuilder, MessageType, KMBuilder, SystemActorType}
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
import org.scalatest.concurrent.Eventually
import org.scalatest.mock.MockitoSugar
import org.scalatest.time.{Milliseconds, Span}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala
index af44443..23558b4 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.handler
+package org.apache.toree.kernel.protocol.v5.handler
import akka.actor.{ActorRef, ActorSelection, ActorSystem, Props}
import akka.testkit.{TestProbe, ImplicitSender, TestKit}
-import com.ibm.spark.kernel.protocol.v5.content.KernelInfoReply
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
-import com.ibm.spark.kernel.protocol.v5.{SystemActorType, Header, KernelMessage}
+import org.apache.toree.kernel.protocol.v5.content.KernelInfoReply
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5.{SystemActorType, Header, KernelMessage}
import org.mockito.AdditionalMatchers.{not => mockNot}
import org.mockito.Matchers.{eq => mockEq}
import com.typesafe.config.ConfigFactory
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/interpreter/tasks/ExecuteRequestTaskActorSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/interpreter/tasks/ExecuteRequestTaskActorSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/interpreter/tasks/ExecuteRequestTaskActorSpec.scala
index be982cb..98824ab 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/interpreter/tasks/ExecuteRequestTaskActorSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/interpreter/tasks/ExecuteRequestTaskActorSpec.scala
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.interpreter.tasks
+package org.apache.toree.kernel.protocol.v5.interpreter.tasks
import java.io.OutputStream
import akka.actor.{ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit}
-import com.ibm.spark.interpreter._
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.content._
+import org.apache.toree.interpreter._
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.content._
import com.typesafe.config.ConfigFactory
import org.mockito.Mockito._
import org.mockito.Matchers.{eq => mockEq, anyString, anyBoolean}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala
index 8bb5f40..bc7d79d 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/ActorLoaderSpec.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel
+package org.apache.toree.kernel.protocol.v5.kernel
import akka.actor.{ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import com.ibm.spark.kernel.protocol.v5.{MessageType, SocketType}
+import org.apache.toree.kernel.protocol.v5.{MessageType, SocketType}
import org.scalatest.mock.MockitoSugar
import org.scalatest.{FunSpecLike, Matchers}
import test.utils.TestProbeProxyActor
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/SimpleActorLoaderSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/SimpleActorLoaderSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/SimpleActorLoaderSpec.scala
index 65f0990..d4a1f40 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/SimpleActorLoaderSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/SimpleActorLoaderSpec.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel
+package org.apache.toree.kernel.protocol.v5.kernel
import akka.actor.{ActorSelection, ActorSystem, Props}
import akka.testkit.{TestKit, TestProbe}
-import com.ibm.spark.kernel.protocol.v5.MessageType
+import org.apache.toree.kernel.protocol.v5.MessageType
import org.scalatest.{FunSpecLike, Matchers}
import test.utils.TestProbeProxyActor
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/UtilitiesSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/UtilitiesSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/UtilitiesSpec.scala
index 67c6eeb..907d822 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/UtilitiesSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/UtilitiesSpec.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel
+package org.apache.toree.kernel.protocol.v5.kernel
import akka.util.ByteString
-import com.ibm.spark.communication.ZMQMessage
-import com.ibm.spark.kernel.protocol.v5._
+import org.apache.toree.communication.ZMQMessage
+import org.apache.toree.kernel.protocol.v5._
import org.scalatest.{FunSpec, Matchers}
/**
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/HeartbeatSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/HeartbeatSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/HeartbeatSpec.scala
index 388f466..0d5f3ac 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/HeartbeatSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/HeartbeatSpec.scala
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel.socket
+package org.apache.toree.kernel.protocol.v5.kernel.socket
import akka.actor.{ActorRef, ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
import akka.util.ByteString
-import com.ibm.spark.communication.ZMQMessage
+import org.apache.toree.communication.ZMQMessage
import com.typesafe.config.ConfigFactory
import org.mockito.Matchers._
import org.mockito.Mockito._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/IOPubSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/IOPubSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/IOPubSpec.scala
index 6e6fdb3..d8c035a 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/IOPubSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/IOPubSpec.scala
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel.socket
+package org.apache.toree.kernel.protocol.v5.kernel.socket
import akka.actor.{ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import com.ibm.spark.communication.ZMQMessage
-import com.ibm.spark.kernel.protocol.v5.kernel.Utilities
-import com.ibm.spark.kernel.protocol.v5Test._
+import org.apache.toree.communication.ZMQMessage
+import org.apache.toree.kernel.protocol.v5.kernel.Utilities
+import org.apache.toree.kernel.protocol.v5Test._
import Utilities._
import com.typesafe.config.ConfigFactory
import org.mockito.Matchers._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/ShellSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/ShellSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/ShellSpec.scala
index d28a5ae..e87fb80 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/ShellSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/ShellSpec.scala
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel.socket
+package org.apache.toree.kernel.protocol.v5.kernel.socket
import java.nio.charset.Charset
import akka.actor.{ActorSelection, ActorRef, ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
import akka.util.ByteString
-import com.ibm.spark.communication.ZMQMessage
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.kernel.{ActorLoader, Utilities}
-import com.ibm.spark.kernel.protocol.v5Test._
+import org.apache.toree.communication.ZMQMessage
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.kernel.{ActorLoader, Utilities}
+import org.apache.toree.kernel.protocol.v5Test._
import Utilities._
import com.typesafe.config.ConfigFactory
import org.mockito.Matchers._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala
index b36f734..af9a4dd 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel.socket
+package org.apache.toree.kernel.protocol.v5.kernel.socket
import com.typesafe.config.ConfigFactory
import org.scalatest.{FunSpec, Matchers}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConnectionSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConnectionSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConnectionSpec.scala
index f33ddc0..a922684 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConnectionSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConnectionSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel.socket
+package org.apache.toree.kernel.protocol.v5.kernel.socket
import org.scalatest.{FunSpec, Matchers}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketFactorySpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketFactorySpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketFactorySpec.scala
index abefdb3..bd034ce 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketFactorySpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketFactorySpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel.socket
+package org.apache.toree.kernel.protocol.v5.kernel.socket
import org.scalatest.{FunSpec, Matchers}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/StdinSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/StdinSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/StdinSpec.scala
index 2103904..a9830d8 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/StdinSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/StdinSpec.scala
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.kernel.socket
+package org.apache.toree.kernel.protocol.v5.kernel.socket
import java.nio.charset.Charset
import akka.actor.{Props, ActorSelection, ActorRef, ActorSystem}
import akka.testkit.{TestProbe, ImplicitSender, TestKit}
import akka.util.ByteString
-import com.ibm.spark.communication.ZMQMessage
-import com.ibm.spark.kernel.protocol.v5.kernel.Utilities._
-import com.ibm.spark.kernel.protocol.v5Test._
-import com.ibm.spark.kernel.protocol.v5.{KernelMessage, SystemActorType}
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.communication.ZMQMessage
+import org.apache.toree.kernel.protocol.v5.kernel.Utilities._
+import org.apache.toree.kernel.protocol.v5Test._
+import org.apache.toree.kernel.protocol.v5.{KernelMessage, SystemActorType}
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
import com.typesafe.config.ConfigFactory
import org.scalatest.mock.MockitoSugar
import org.scalatest.{Matchers, FunSpecLike}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/MagicParserSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/MagicParserSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/MagicParserSpec.scala
index ba3415f..2a1d46c 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/MagicParserSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/MagicParserSpec.scala
@@ -1,6 +1,6 @@
-package com.ibm.spark.kernel.protocol.v5.magic
+package org.apache.toree.kernel.protocol.v5.magic
-import com.ibm.spark.magic.MagicLoader
+import org.apache.toree.magic.MagicLoader
import org.scalatest.mock.MockitoSugar
import org.scalatest.{FunSpec, Matchers}
import org.mockito.Mockito._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/PostProcessorSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/PostProcessorSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/PostProcessorSpec.scala
index 1557460..f3be08d 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/PostProcessorSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/magic/PostProcessorSpec.scala
@@ -1,8 +1,8 @@
-package com.ibm.spark.kernel.protocol.v5.magic
+package org.apache.toree.kernel.protocol.v5.magic
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.magic.{CellMagicOutput, LineMagicOutput}
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.magic.{CellMagicOutput, LineMagicOutput}
import org.mockito.Matchers._
import org.mockito.Mockito._
import org.scalatest.mock.MockitoSugar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelaySpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelaySpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelaySpec.scala
index 7adf620..296cbe0 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelaySpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/ExecuteRequestRelaySpec.scala
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.relay
+package org.apache.toree.kernel.protocol.v5.relay
import java.io.OutputStream
import akka.actor._
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import com.ibm.spark.interpreter.{ExecuteAborted, ExecuteError}
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.content._
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
-import com.ibm.spark.kernel.protocol.v5.magic.{MagicParser, PostProcessor}
-import com.ibm.spark.magic.MagicLoader
-import com.ibm.spark.magic.dependencies.DependencyMap
+import org.apache.toree.interpreter.{ExecuteAborted, ExecuteError}
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.content._
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5.magic.{MagicParser, PostProcessor}
+import org.apache.toree.magic.MagicLoader
+import org.apache.toree.magic.dependencies.DependencyMap
import com.typesafe.config.ConfigFactory
import org.mockito.Mockito._
import org.scalatest.mock.MockitoSugar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala
index 63fa50c..66dc0d4 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/relay/KernelMessageRelaySpec.scala
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.relay
+package org.apache.toree.kernel.protocol.v5.relay
import akka.actor._
import akka.testkit.{ImplicitSender, TestKit, TestProbe}
-import com.ibm.spark.communication.ZMQMessage
-import com.ibm.spark.communication.security.SecurityActorType
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.kernel.{ActorLoader, Utilities}
+import org.apache.toree.communication.ZMQMessage
+import org.apache.toree.communication.security.SecurityActorType
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.kernel.{ActorLoader, Utilities}
import Utilities._
import org.mockito.Mockito._
import org.scalatest.concurrent.{PatienceConfiguration, ScalaFutures}
@@ -31,7 +31,7 @@ import org.scalatest.{BeforeAndAfter, FunSpecLike, Matchers}
import org.mockito.Matchers.{eq => mockEq}
import org.mockito.AdditionalMatchers.{not => mockNot}
import scala.concurrent.duration._
-import com.ibm.spark.kernel.protocol.v5.KernelMessage
+import org.apache.toree.kernel.protocol.v5.KernelMessage
import scala.concurrent._
import akka.pattern.pipe
import scala.util.Random
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala
index 5d06cb6..0686dc5 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelInputStreamSpec.scala
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.stream
+package org.apache.toree.kernel.protocol.v5.stream
import akka.actor.{ActorRef, Actor, ActorSystem}
import akka.testkit.{TestActorRef, TestKit, TestProbe}
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.content.InputRequest
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.content.InputRequest
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
import org.mockito.Mockito._
import org.scalatest._
import org.scalatest.mock.MockitoSugar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala
index cb4f158..be71728 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala
@@ -14,20 +14,20 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.stream
+package org.apache.toree.kernel.protocol.v5.stream
import java.util.UUID
import akka.actor.{ActorSelection, ActorSystem}
import akka.testkit.{TestKit, TestProbe}
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
-import com.ibm.spark.utils.ScheduledTaskManager
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.utils.ScheduledTaskManager
import org.mockito.Mockito._
import org.scalatest.mock.MockitoSugar
import org.scalatest._
import play.api.libs.json._
-import com.ibm.spark.kernel.protocol.v5.content.StreamContent
+import org.apache.toree.kernel.protocol.v5.content.StreamContent
import scala.concurrent.duration._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/magic/builtin/AddDepsSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/magic/builtin/AddDepsSpec.scala b/kernel/src/test/scala/org/apache/toree/magic/builtin/AddDepsSpec.scala
index 956088c..c13d4bb 100644
--- a/kernel/src/test/scala/org/apache/toree/magic/builtin/AddDepsSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/magic/builtin/AddDepsSpec.scala
@@ -14,22 +14,22 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.builtin
+package org.apache.toree.magic.builtin
import java.io.{ByteArrayOutputStream, OutputStream}
import java.net.URL
-import com.ibm.spark.dependencies.DependencyDownloader
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.utils.ArgumentParsingSupport
+import org.apache.toree.dependencies.DependencyDownloader
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.utils.ArgumentParsingSupport
import org.apache.spark.SparkContext
import org.scalatest.mock.MockitoSugar
import org.scalatest.{GivenWhenThen, Matchers, FunSpec}
import org.mockito.Mockito._
import org.mockito.Matchers._
-import com.ibm.spark.magic._
-import com.ibm.spark.magic.dependencies._
+import org.apache.toree.magic._
+import org.apache.toree.magic.dependencies._
class AddDepsSpec extends FunSpec with Matchers with MockitoSugar
with GivenWhenThen
@@ -92,7 +92,7 @@ class AddDepsSpec extends FunSpec with Matchers with MockitoSugar
override val outputStream: OutputStream = mock[OutputStream]
}
- val expected = "com.ibm.spark" :: "kernel" :: "1.0" :: "--transitive" :: Nil
+ val expected = "org.apache.toree" :: "kernel" :: "1.0" :: "--transitive" :: Nil
addDepsMagic.execute(expected.mkString(" "))
verify(mockDependencyDownloader).retrieve(
@@ -118,7 +118,7 @@ class AddDepsSpec extends FunSpec with Matchers with MockitoSugar
override val outputStream: OutputStream = mock[OutputStream]
}
- val expected = "com.ibm.spark" :: "kernel" :: "1.0" :: Nil
+ val expected = "org.apache.toree" :: "kernel" :: "1.0" :: Nil
addDepsMagic.execute(expected.mkString(" "))
verify(mockDependencyDownloader).retrieve(
@@ -145,7 +145,7 @@ class AddDepsSpec extends FunSpec with Matchers with MockitoSugar
override val outputStream: OutputStream = mock[OutputStream]
}
- val expected = "com.ibm.spark" :: "kernel" :: "1.0" :: Nil
+ val expected = "org.apache.toree" :: "kernel" :: "1.0" :: Nil
addDepsMagic.execute(expected.mkString(" "))
verify(mockInterpreter).addJars(any[URL])
@@ -174,7 +174,7 @@ class AddDepsSpec extends FunSpec with Matchers with MockitoSugar
override val outputStream: OutputStream = mock[OutputStream]
}
- val expected = "com.ibm.spark" :: "kernel" :: "1.0" :: Nil
+ val expected = "org.apache.toree" :: "kernel" :: "1.0" :: Nil
addDepsMagic.execute(expected.mkString(" "))
verify(mockSparkContext, times(3)).addJar(anyString())
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/magic/builtin/AddJarSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/magic/builtin/AddJarSpec.scala b/kernel/src/test/scala/org/apache/toree/magic/builtin/AddJarSpec.scala
index 5612c8a..5489de3 100644
--- a/kernel/src/test/scala/org/apache/toree/magic/builtin/AddJarSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/magic/builtin/AddJarSpec.scala
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.builtin
+package org.apache.toree.magic.builtin
import java.io.OutputStream
import java.net.URL
import java.nio.file.{FileSystems, Files}
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.magic.dependencies.{IncludeConfig, IncludeOutputStream, IncludeInterpreter, IncludeSparkContext}
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.magic.dependencies.{IncludeConfig, IncludeOutputStream, IncludeInterpreter, IncludeSparkContext}
import com.typesafe.config.ConfigFactory
import org.apache.spark.SparkContext
import org.scalatest.{Matchers, FunSpec}
@@ -29,7 +29,7 @@ import org.scalatest.mock.MockitoSugar
import org.mockito.Mockito._
import org.mockito.Matchers._
-import com.ibm.spark.magic.MagicLoader
+import org.apache.toree.magic.MagicLoader
class AddJarSpec extends FunSpec with Matchers with MockitoSugar {
describe("AddJar"){
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/magic/builtin/BuiltinLoaderSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/magic/builtin/BuiltinLoaderSpec.scala b/kernel/src/test/scala/org/apache/toree/magic/builtin/BuiltinLoaderSpec.scala
index d2abde7..7b08db3 100644
--- a/kernel/src/test/scala/org/apache/toree/magic/builtin/BuiltinLoaderSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/magic/builtin/BuiltinLoaderSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.builtin
+package org.apache.toree.magic.builtin
import org.scalatest.mock.MockitoSugar
import org.scalatest.{Matchers, FunSpec}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/magic/builtin/HtmlSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/magic/builtin/HtmlSpec.scala b/kernel/src/test/scala/org/apache/toree/magic/builtin/HtmlSpec.scala
index 541cfcd..20856af 100644
--- a/kernel/src/test/scala/org/apache/toree/magic/builtin/HtmlSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/magic/builtin/HtmlSpec.scala
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.builtin
+package org.apache.toree.magic.builtin
-import com.ibm.spark.kernel.protocol.v5.MIMEType
-import com.ibm.spark.magic.CellMagicOutput
+import org.apache.toree.kernel.protocol.v5.MIMEType
+import org.apache.toree.magic.CellMagicOutput
import org.scalatest.mock.MockitoSugar
import org.scalatest.{FunSpec, Matchers}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/magic/builtin/JavaScriptSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/magic/builtin/JavaScriptSpec.scala b/kernel/src/test/scala/org/apache/toree/magic/builtin/JavaScriptSpec.scala
index 33dfbd5..e7ad7b4 100644
--- a/kernel/src/test/scala/org/apache/toree/magic/builtin/JavaScriptSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/magic/builtin/JavaScriptSpec.scala
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.builtin
+package org.apache.toree.magic.builtin
import org.scalatest.mock.MockitoSugar
import org.scalatest.{FunSpec, Matchers}
-import com.ibm.spark.magic.CellMagicOutput
-import com.ibm.spark.kernel.protocol.v5.MIMEType
+import org.apache.toree.magic.CellMagicOutput
+import org.apache.toree.kernel.protocol.v5.MIMEType
class JavaScriptSpec extends FunSpec with Matchers with MockitoSugar {
describe("JavaScript"){
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/magic/builtin/LSMagicSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/magic/builtin/LSMagicSpec.scala b/kernel/src/test/scala/org/apache/toree/magic/builtin/LSMagicSpec.scala
index 60b4a6a..3447cbb 100644
--- a/kernel/src/test/scala/org/apache/toree/magic/builtin/LSMagicSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/magic/builtin/LSMagicSpec.scala
@@ -1,11 +1,11 @@
-package com.ibm.spark.magic.builtin
+package org.apache.toree.magic.builtin
import java.io.OutputStream
import java.net.URL
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.magic.dependencies.{IncludeOutputStream, IncludeInterpreter, IncludeSparkContext}
-import com.ibm.spark.magic.{CellMagic, LineMagic}
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.magic.dependencies.{IncludeOutputStream, IncludeInterpreter, IncludeSparkContext}
+import org.apache.toree.magic.{CellMagic, LineMagic}
import org.apache.spark.SparkContext
import org.scalatest.{Matchers, FunSpec}
import org.scalatest.mock.MockitoSugar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/magic/builtin/RDDSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/magic/builtin/RDDSpec.scala b/kernel/src/test/scala/org/apache/toree/magic/builtin/RDDSpec.scala
index 56b4cb7..7c0e435 100644
--- a/kernel/src/test/scala/org/apache/toree/magic/builtin/RDDSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/magic/builtin/RDDSpec.scala
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.builtin
+package org.apache.toree.magic.builtin
-import com.ibm.spark.interpreter.Results.Result
-import com.ibm.spark.interpreter.{Results, ExecuteAborted, ExecuteError, Interpreter}
-import com.ibm.spark.kernel.protocol.v5.MIMEType
-import com.ibm.spark.magic.dependencies.{IncludeKernelInterpreter, IncludeInterpreter}
+import org.apache.toree.interpreter.Results.Result
+import org.apache.toree.interpreter.{Results, ExecuteAborted, ExecuteError, Interpreter}
+import org.apache.toree.kernel.protocol.v5.MIMEType
+import org.apache.toree.magic.dependencies.{IncludeKernelInterpreter, IncludeInterpreter}
import org.apache.spark.sql.DataFrame
import org.apache.spark.sql.types.StructType
import org.mockito.Matchers._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/org/apache/toree/utils/json/RddToJsonSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/utils/json/RddToJsonSpec.scala b/kernel/src/test/scala/org/apache/toree/utils/json/RddToJsonSpec.scala
index 121d35e..0f6c277 100644
--- a/kernel/src/test/scala/org/apache/toree/utils/json/RddToJsonSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/utils/json/RddToJsonSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils.json
+package org.apache.toree.utils.json
import org.apache.spark.rdd.RDD
import org.apache.spark.sql.DataFrame
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/system/KernelCommSpecForSystem.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/system/KernelCommSpecForSystem.scala b/kernel/src/test/scala/system/KernelCommSpecForSystem.scala
index 5b2269d..4866896 100644
--- a/kernel/src/test/scala/system/KernelCommSpecForSystem.scala
+++ b/kernel/src/test/scala/system/KernelCommSpecForSystem.scala
@@ -17,12 +17,12 @@
package system
import akka.testkit.{TestProbe}
-import com.ibm.spark.communication.ZMQMessage
-import com.ibm.spark.kernel.protocol.v5.kernel.{ActorLoader, Utilities}
+import org.apache.toree.communication.ZMQMessage
+import org.apache.toree.kernel.protocol.v5.kernel.{ActorLoader, Utilities}
import Utilities._
-import com.ibm.spark.kernel.protocol.v5
-import com.ibm.spark.kernel.protocol.v5.{KernelMessage, SocketType, KMBuilder}
-import com.ibm.spark.kernel.protocol.v5.content._
+import org.apache.toree.kernel.protocol.v5
+import org.apache.toree.kernel.protocol.v5.{KernelMessage, SocketType, KMBuilder}
+import org.apache.toree.kernel.protocol.v5.content._
import org.scalatest._
import play.api.libs.json.Json
import scala.concurrent.duration._
@@ -43,7 +43,7 @@ class KernelCommSpecForSystem
{
private val MaxFishTime = 5.seconds
- import com.ibm.spark.boot.layer.SparkKernelDeployer._
+ import org.apache.toree.boot.layer.SparkKernelDeployer._
private def waitForExecuteReply(
shell: TestProbe, headerId: v5.UUID, maxTime: Duration = MaxFishTime
@@ -202,7 +202,7 @@ class KernelCommSpecForSystem
s"""
|val commWriter = kernel.comm.open("$testTargetName")
|commWriter.writeMsg(
- | com.ibm.spark.kernel.protocol.v5.MsgData("key" -> "value")
+ | org.apache.toree.kernel.protocol.v5.MsgData("key" -> "value")
|)
""".stripMargin.trim
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/system/SuiteForSystem.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/system/SuiteForSystem.scala b/kernel/src/test/scala/system/SuiteForSystem.scala
index 5ed10b0..1fe94fa 100644
--- a/kernel/src/test/scala/system/SuiteForSystem.scala
+++ b/kernel/src/test/scala/system/SuiteForSystem.scala
@@ -1,6 +1,6 @@
package system
-import com.ibm.spark.boot.layer.SparkKernelDeployer
+import org.apache.toree.boot.layer.SparkKernelDeployer
import org.scalatest.{BeforeAndAfterAll, Suites}
class SuiteForSystem extends Suites(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/system/TruncationTests.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/system/TruncationTests.scala b/kernel/src/test/scala/system/TruncationTests.scala
index 9d4fbd8..39ca1ce 100644
--- a/kernel/src/test/scala/system/TruncationTests.scala
+++ b/kernel/src/test/scala/system/TruncationTests.scala
@@ -17,17 +17,17 @@
package system
import akka.testkit.TestProbe
-import com.ibm.spark.communication.ZMQMessage
-import com.ibm.spark.kernel.protocol.v5.kernel.{ActorLoader, Utilities}
+import org.apache.toree.communication.ZMQMessage
+import org.apache.toree.kernel.protocol.v5.kernel.{ActorLoader, Utilities}
import Utilities._
-import com.ibm.spark.kernel.protocol.v5
-import com.ibm.spark.kernel.protocol.v5.{KernelMessage, SocketType, KMBuilder}
-import com.ibm.spark.kernel.protocol.v5.content._
+import org.apache.toree.kernel.protocol.v5
+import org.apache.toree.kernel.protocol.v5.{KernelMessage, SocketType, KMBuilder}
+import org.apache.toree.kernel.protocol.v5.content._
import org.scalatest._
import play.api.libs.json.Json
import scala.concurrent.duration._
import test.utils.NoArgSparkKernelTestKit
-import com.ibm.spark.boot.layer.SparkKernelDeployer
+import org.apache.toree.boot.layer.SparkKernelDeployer
/**
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/test/utils/DummyInterpreter.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/test/utils/DummyInterpreter.scala b/kernel/src/test/scala/test/utils/DummyInterpreter.scala
index aec9635..016eee2 100644
--- a/kernel/src/test/scala/test/utils/DummyInterpreter.scala
+++ b/kernel/src/test/scala/test/utils/DummyInterpreter.scala
@@ -2,9 +2,9 @@ package test.utils
import java.net.URL
-import com.ibm.spark.interpreter.{ExecuteFailure, ExecuteOutput, Interpreter}
-import com.ibm.spark.interpreter.Results.Result
-import com.ibm.spark.kernel.api.KernelLike
+import org.apache.toree.interpreter.{ExecuteFailure, ExecuteOutput, Interpreter}
+import org.apache.toree.interpreter.Results.Result
+import org.apache.toree.kernel.api.KernelLike
import org.apache.spark.SparkContext
import org.apache.spark.sql.SQLContext
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/test/utils/NoArgSparkKernelTestKit.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/test/utils/NoArgSparkKernelTestKit.scala b/kernel/src/test/scala/test/utils/NoArgSparkKernelTestKit.scala
index ed3800f..e19036b 100644
--- a/kernel/src/test/scala/test/utils/NoArgSparkKernelTestKit.scala
+++ b/kernel/src/test/scala/test/utils/NoArgSparkKernelTestKit.scala
@@ -17,7 +17,7 @@
package test.utils
import akka.testkit.TestKit
-import com.ibm.spark.boot.layer.SparkKernelDeployer
+import org.apache.toree.boot.layer.SparkKernelDeployer
class NoArgSparkKernelTestKit
extends TestKit(SparkKernelDeployer.getNoArgSparkKernelActorSystem)
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/test/scala/test/utils/SparkKernelDeployer.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/test/utils/SparkKernelDeployer.scala b/kernel/src/test/scala/test/utils/SparkKernelDeployer.scala
index 877b162..a4b6189 100644
--- a/kernel/src/test/scala/test/utils/SparkKernelDeployer.scala
+++ b/kernel/src/test/scala/test/utils/SparkKernelDeployer.scala
@@ -14,27 +14,27 @@
* limitations under the License.
*/
-package com.ibm.spark.boot.layer
+package org.apache.toree.boot.layer
import java.io.OutputStream
import akka.actor.{Actor, Props, ActorRef, ActorSystem}
import akka.testkit.TestProbe
-import com.ibm.spark.boot.{CommandLineOptions, KernelBootstrap}
-import com.ibm.spark.kernel.api.KernelLike
-import com.ibm.spark.kernel.interpreter.scala.{StandardTaskManagerProducer, StandardSparkIMainProducer, StandardSettingsProducer, ScalaInterpreter}
-import com.ibm.spark.kernel.protocol.v5.{KMBuilder, SocketType}
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
-import com.ibm.spark.kernel.protocol.v5.kernel.socket._
-import com.ibm.spark.utils.LogLike
+import org.apache.toree.boot.{CommandLineOptions, KernelBootstrap}
+import org.apache.toree.kernel.api.KernelLike
+import org.apache.toree.kernel.interpreter.scala.{StandardTaskManagerProducer, StandardSparkIMainProducer, StandardSettingsProducer, ScalaInterpreter}
+import org.apache.toree.kernel.protocol.v5.{KMBuilder, SocketType}
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.kernel.protocol.v5.kernel.socket._
+import org.apache.toree.utils.LogLike
import com.typesafe.config.Config
import org.scalatest.mock.MockitoSugar
import play.api.libs.json.Json
import scala.collection.JavaConverters._
import test.utils.SparkContextProvider
import org.apache.spark.{SparkContext, SparkConf}
-import com.ibm.spark.kernel.protocol.v5.stream.KernelOutputStream
-import com.ibm.spark.global
+import org.apache.toree.kernel.protocol.v5.stream.KernelOutputStream
+import org.apache.toree.global
/**
* Represents an object that can deploy a singleton Spark Kernel for tests,
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/macros/src/main/scala/org/apache/toree/annotations/Experimental.scala
----------------------------------------------------------------------
diff --git a/macros/src/main/scala/org/apache/toree/annotations/Experimental.scala b/macros/src/main/scala/org/apache/toree/annotations/Experimental.scala
index 241cdc6..8f51434 100644
--- a/macros/src/main/scala/org/apache/toree/annotations/Experimental.scala
+++ b/macros/src/main/scala/org/apache/toree/annotations/Experimental.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.annotations
+package org.apache.toree.annotations
import scala.language.experimental.macros
import scala.annotation.{StaticAnnotation, Annotation}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/project/Build.scala
----------------------------------------------------------------------
diff --git a/project/Build.scala b/project/Build.scala
index ffea504..1ecba1d 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -186,7 +186,7 @@ trait SubProjects extends Settings with TestTasks {
simpleDateFormat.format(now)
}
),
- buildInfoPackage := "com.ibm.spark.kernel"
+ buildInfoPackage := "org.apache.toree.kernel"
)
/**
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/project/Common.scala
----------------------------------------------------------------------
diff --git a/project/Common.scala b/project/Common.scala
index 337b620..a409de8 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -32,7 +32,7 @@ object Common {
val repoUrl = Properties.envOrElse("REPO_URL", s"http://${repoHost}:${repoPort}${repoEndpoint}")
- private val buildOrganization = "com.ibm.spark"
+ private val buildOrganization = "org.apache.toree"
private val buildVersion =
if (snapshot) s"$versionNumber-SNAPSHOT"
else versionNumber
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/comm/CommCallbacks.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/comm/CommCallbacks.scala b/protocol/src/main/scala/org/apache/toree/comm/CommCallbacks.scala
index d462874..8f3f560 100644
--- a/protocol/src/main/scala/org/apache/toree/comm/CommCallbacks.scala
+++ b/protocol/src/main/scala/org/apache/toree/comm/CommCallbacks.scala
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.comm
+package org.apache.toree.comm
-import com.ibm.spark.annotations.Experimental
-import com.ibm.spark.kernel.protocol.v5._
+import org.apache.toree.annotations.Experimental
+import org.apache.toree.kernel.protocol.v5._
import scala.util.Try
@@ -27,7 +27,7 @@ object CommCallbacks {
type CloseCallback = (CommWriter, UUID, MsgData) => Unit
}
-import com.ibm.spark.comm.CommCallbacks._
+import org.apache.toree.comm.CommCallbacks._
/**
* Represents available callbacks to be triggered when various Comm events
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/comm/CommManager.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/comm/CommManager.scala b/protocol/src/main/scala/org/apache/toree/comm/CommManager.scala
index c15f1a5..536d69a 100644
--- a/protocol/src/main/scala/org/apache/toree/comm/CommManager.scala
+++ b/protocol/src/main/scala/org/apache/toree/comm/CommManager.scala
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package com.ibm.spark.comm
+package org.apache.toree.comm
import java.util.UUID
-import com.ibm.spark.annotations.Experimental
-import com.ibm.spark.comm.CommCallbacks.{CloseCallback, OpenCallback}
-import com.ibm.spark.kernel.protocol.v5
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.content.CommContent
+import org.apache.toree.annotations.Experimental
+import org.apache.toree.comm.CommCallbacks.{CloseCallback, OpenCallback}
+import org.apache.toree.kernel.protocol.v5
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.content.CommContent
/**
* Represents a manager for Comm connections that facilitates and maintains
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/comm/CommRegistrar.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/comm/CommRegistrar.scala b/protocol/src/main/scala/org/apache/toree/comm/CommRegistrar.scala
index 84df054..0495b34 100644
--- a/protocol/src/main/scala/org/apache/toree/comm/CommRegistrar.scala
+++ b/protocol/src/main/scala/org/apache/toree/comm/CommRegistrar.scala
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.comm
+package org.apache.toree.comm
-import com.ibm.spark.annotations.Experimental
-import com.ibm.spark.comm.CommCallbacks._
-import com.ibm.spark.kernel.protocol.v5
+import org.apache.toree.annotations.Experimental
+import org.apache.toree.comm.CommCallbacks._
+import org.apache.toree.kernel.protocol.v5
import scala.annotation.tailrec
import scala.collection.immutable
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/comm/CommStorage.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/comm/CommStorage.scala b/protocol/src/main/scala/org/apache/toree/comm/CommStorage.scala
index 0aaff9a..5d0be8f 100644
--- a/protocol/src/main/scala/org/apache/toree/comm/CommStorage.scala
+++ b/protocol/src/main/scala/org/apache/toree/comm/CommStorage.scala
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.ibm.spark.comm
+package org.apache.toree.comm
-import com.ibm.spark.annotations.Experimental
-import com.ibm.spark.kernel.protocol.v5
+import org.apache.toree.annotations.Experimental
+import org.apache.toree.kernel.protocol.v5
import scala.collection.immutable
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/comm/CommWriter.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/comm/CommWriter.scala b/protocol/src/main/scala/org/apache/toree/comm/CommWriter.scala
index 772e582..e16b2fe 100644
--- a/protocol/src/main/scala/org/apache/toree/comm/CommWriter.scala
+++ b/protocol/src/main/scala/org/apache/toree/comm/CommWriter.scala
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.comm
+package org.apache.toree.comm
-import com.ibm.spark.annotations.Experimental
-import com.ibm.spark.kernel.protocol.v5
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.content._
+import org.apache.toree.annotations.Experimental
+import org.apache.toree.kernel.protocol.v5
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.content._
import java.io.Writer
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/Header.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/Header.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/Header.scala
index 284b2bc..c382ba4 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/Header.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/Header.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5
+package org.apache.toree.kernel.protocol.v5
import play.api.libs.json._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilder.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilder.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilder.scala
index 4061ffe..61004a2 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilder.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilder.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5
+package org.apache.toree.kernel.protocol.v5
object HeaderBuilder {
/**
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KMBuilder.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KMBuilder.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KMBuilder.scala
index 4ed4ab5..e49a5cc 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KMBuilder.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KMBuilder.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5
+package org.apache.toree.kernel.protocol.v5
import java.util.Calendar
-import com.ibm.spark.kernel.protocol.v5.MessageType.MessageType
+import org.apache.toree.kernel.protocol.v5.MessageType.MessageType
/**
* A class for building KernelMessages.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessage.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessage.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessage.scala
index 5663933..5490670 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessage.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessage.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5
+package org.apache.toree.kernel.protocol.v5
case class KernelMessage(
ids: Seq[String],
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessageContent.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessageContent.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessageContent.scala
index ed7af7c..ffe0b0c 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessageContent.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/KernelMessageContent.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5
+package org.apache.toree.kernel.protocol.v5
trait KernelMessageContent {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala
index 1794c93..a3e7e50 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/SparkKernelInfo.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5
+package org.apache.toree.kernel.protocol.v5
-import com.ibm.spark.kernel.BuildInfo
+import org.apache.toree.kernel.BuildInfo
object SparkKernelInfo {
/**
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutput.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutput.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutput.scala
index 9b7eabe..85e961c 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutput.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutput.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.functional.syntax._
import play.api.libs.json._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommClose.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommClose.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommClose.scala
index e74ea72..0b69fdf 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommClose.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommClose.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5._
import play.api.libs.json.Json
case class CommClose(comm_id: UUID, data: MsgData)
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommContent.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommContent.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommContent.scala
index 5e98e08..a910ed4 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommContent.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommContent.scala
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
/**
* Represents a series of subclasses of KernelMessageContent that embodies the
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommMsg.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommMsg.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommMsg.scala
index e85e1f0..16d47f9 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommMsg.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommMsg.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.{MsgData, KernelMessageContent, UUID}
+import org.apache.toree.kernel.protocol.v5.{MsgData, KernelMessageContent, UUID}
import play.api.libs.json.Json
case class CommMsg(comm_id: UUID, data: MsgData)
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommOpen.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommOpen.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommOpen.scala
index b83d7ff..dfee897 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommOpen.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CommOpen.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5._
import play.api.libs.json.Json
case class CommOpen(comm_id: UUID, target_name: String, data: MsgData)
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReply.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReply.scala
index 2edcfa7..91faed9 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReply.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReply.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.{KernelMessageContent, Metadata}
+import org.apache.toree.kernel.protocol.v5.{KernelMessageContent, Metadata}
import play.api.libs.json.Json
case class CompleteReply (
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequest.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequest.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequest.scala
index 33d7e68..a5d24b8 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequest.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequest.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json.Json
case class CompleteRequest(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReply.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReply.scala
index 18ce82f..3b5c3cf 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReply.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReply.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json.Json
case class ConnectReply(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequest.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequest.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequest.scala
index 1c9e4a6..6da6527 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequest.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequest.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json._
case class ConnectRequest() extends KernelMessageContent {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/DisplayData.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/DisplayData.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/DisplayData.scala
index 7a959fa..436c68f 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/DisplayData.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/DisplayData.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.{KernelMessageContent, Data, Metadata}
+import org.apache.toree.kernel.protocol.v5.{KernelMessageContent, Data, Metadata}
import play.api.libs.json._
case class DisplayData(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContent.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContent.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContent.scala
index 4ba6888..2e649a7 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContent.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContent.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json.Json
import scala.language.implicitConversions
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInput.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInput.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInput.scala
index a1ec262..4eac017 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInput.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInput.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json._
case class ExecuteInput(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReply.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReply.scala
index 3462e73..e640861 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReply.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReply.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
// External libraries
-import com.ibm.spark.kernel.protocol.v5.{KernelMessageContent, UserExpressions, Payloads}
+import org.apache.toree.kernel.protocol.v5.{KernelMessageContent, UserExpressions, Payloads}
import play.api.libs.json._
// Internal libraries
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequest.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequest.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequest.scala
index 544e4c9..3dc25b5 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequest.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequest.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.{KernelMessageContent, UserExpressions}
+import org.apache.toree.kernel.protocol.v5.{KernelMessageContent, UserExpressions}
import play.api.libs.json._
case class ExecuteRequest(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResult.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResult.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResult.scala
index 984b4a4..a116d0a 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResult.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResult.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.{KernelMessageContent, Data, Metadata}
+import org.apache.toree.kernel.protocol.v5.{KernelMessageContent, Data, Metadata}
import play.api.libs.json.Json
case class ExecuteResult (
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReply.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReply.scala
index 5f2b987..17e8819 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReply.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReply.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json.Json
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequest.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequest.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequest.scala
index 4a0a21a..6a8bc1b 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequest.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequest.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json.Json
case class HistoryRequest(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputReply.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputReply.scala
index bf6313e..985d3c4 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputReply.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputReply.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json._
case class InputReply(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputRequest.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputRequest.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputRequest.scala
index 0190f17..d673b0d 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputRequest.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InputRequest.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json._
case class InputRequest(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectReply.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectReply.scala
index 506a869..8847ff3 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectReply.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectReply.scala
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
// External libraries
import play.api.libs.json._
// Internal libraries
-import com.ibm.spark.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5._
case class InspectReply(
status: String,
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequest.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequest.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequest.scala
index c47ed11..4a8dc12 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequest.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequest.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json._
case class InspectRequest(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala
index cf45bb7..0f23aa5 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReply.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json.Json
case class KernelInfoReply (
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequest.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequest.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequest.scala
index 0d18dd5..a217ef1 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequest.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequest.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json._
case class KernelInfoRequest() extends KernelMessageContent {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatus.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatus.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatus.scala
index 2a28451..dcd7ad5 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatus.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatus.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.protocol.v5.content
+package org.apache.toree.kernel.protocol.v5.content
-import com.ibm.spark.kernel.protocol.v5.KernelMessageContent
+import org.apache.toree.kernel.protocol.v5.KernelMessageContent
import play.api.libs.json._
case class KernelStatus (