http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReply.scala ---------------------------------------------------------------------- diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReply.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReply.scala index 6bf986b..41b2d47 100644 --- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReply.scala +++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReply.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 ShutdownReply(
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequest.scala ---------------------------------------------------------------------- diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequest.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequest.scala index 6681169..e965b5c 100644 --- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequest.scala +++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequest.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 ShutdownRequest( http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/StreamContent.scala ---------------------------------------------------------------------- diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/StreamContent.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/StreamContent.scala index 12d5366..e818926 100644 --- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/StreamContent.scala +++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/StreamContent.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 StreamContent( http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/TypeString.scala ---------------------------------------------------------------------- diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/TypeString.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/TypeString.scala index e163b28..cf6d43d 100644 --- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/TypeString.scala +++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/TypeString.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content /** * Indicates that the implementation contains a method to return the type http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/package.scala ---------------------------------------------------------------------- diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/package.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/package.scala index ad10884..304ad86 100644 --- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/package.scala +++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/content/package.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5 +package org.apache.toree.kernel.protocol.v5 package object content { // Provide an ExecuteReplyOk type and object representing a http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala ---------------------------------------------------------------------- diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala index 7f999dd..3eb2cd4 100644 --- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala +++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol +package org.apache.toree.kernel.protocol -import com.ibm.spark.kernel.protocol.v5.MIMEType.MIMEType +import org.apache.toree.kernel.protocol.v5.MIMEType.MIMEType import play.api.libs.json.{JsValue, Json, JsObject} package object v5 { http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/main/scala/org/apache/toree/utils/LogLike.scala ---------------------------------------------------------------------- diff --git a/protocol/src/main/scala/org/apache/toree/utils/LogLike.scala b/protocol/src/main/scala/org/apache/toree/utils/LogLike.scala index 517140c..edbfd8f 100644 --- a/protocol/src/main/scala/org/apache/toree/utils/LogLike.scala +++ b/protocol/src/main/scala/org/apache/toree/utils/LogLike.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.utils +package org.apache.toree.utils import org.slf4j.LoggerFactory http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/comm/CommCallbacksSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/comm/CommCallbacksSpec.scala b/protocol/src/test/scala/org/apache/toree/comm/CommCallbacksSpec.scala index a84a51d..45acb4d 100644 --- a/protocol/src/test/scala/org/apache/toree/comm/CommCallbacksSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/comm/CommCallbacksSpec.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.comm +package org.apache.toree.comm // TODO: Move duplicate code to separate project (kernel and client) -import com.ibm.spark.comm.CommCallbacks._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.comm.CommCallbacks._ +import org.apache.toree.kernel.protocol.v5._ import org.scalatest.{FunSpec, Matchers} class CommCallbacksSpec extends FunSpec with Matchers { http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/comm/CommManagerSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/comm/CommManagerSpec.scala b/protocol/src/test/scala/org/apache/toree/comm/CommManagerSpec.scala index f02333e..1bdbebf 100644 --- a/protocol/src/test/scala/org/apache/toree/comm/CommManagerSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/comm/CommManagerSpec.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.comm +package org.apache.toree.comm -import com.ibm.spark.comm.CommCallbacks.{CloseCallback, OpenCallback} -import com.ibm.spark.kernel.protocol.v5 -import com.ibm.spark.kernel.protocol.v5.UUID -import com.ibm.spark.kernel.protocol.v5.content.{CommClose, CommOpen} +import org.apache.toree.comm.CommCallbacks.{CloseCallback, OpenCallback} +import org.apache.toree.kernel.protocol.v5 +import org.apache.toree.kernel.protocol.v5.UUID +import org.apache.toree.kernel.protocol.v5.content.{CommClose, CommOpen} import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import org.scalatest.mock.MockitoSugar http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/comm/CommRegistrarSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/comm/CommRegistrarSpec.scala b/protocol/src/test/scala/org/apache/toree/comm/CommRegistrarSpec.scala index ad6b7c6..dde8259 100644 --- a/protocol/src/test/scala/org/apache/toree/comm/CommRegistrarSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/comm/CommRegistrarSpec.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.ibm.spark.comm +package org.apache.toree.comm import java.util.UUID -import com.ibm.spark.comm.CommCallbacks.{CloseCallback, MsgCallback, OpenCallback} +import org.apache.toree.comm.CommCallbacks.{CloseCallback, MsgCallback, OpenCallback} import org.mockito.Mockito._ import org.scalatest.mock.MockitoSugar import org.scalatest.{BeforeAndAfter, FunSpec, Matchers} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/comm/CommStorageSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/comm/CommStorageSpec.scala b/protocol/src/test/scala/org/apache/toree/comm/CommStorageSpec.scala index f92b852..3adbd4f 100644 --- a/protocol/src/test/scala/org/apache/toree/comm/CommStorageSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/comm/CommStorageSpec.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.ibm.spark.comm +package org.apache.toree.comm -import com.ibm.spark.kernel.protocol.v5 -import com.ibm.spark.kernel.protocol.v5.UUID +import org.apache.toree.kernel.protocol.v5 +import org.apache.toree.kernel.protocol.v5.UUID import org.scalatest.mock.MockitoSugar import org.mockito.Mockito._ import org.scalatest.{BeforeAndAfter, Matchers, FunSpec} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/comm/CommWriterSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/comm/CommWriterSpec.scala b/protocol/src/test/scala/org/apache/toree/comm/CommWriterSpec.scala index 0818da3..b3f2b09 100644 --- a/protocol/src/test/scala/org/apache/toree/comm/CommWriterSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/comm/CommWriterSpec.scala @@ -13,13 +13,13 @@ * 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 java.util.UUID -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.kernel.protocol.v5 +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.content._ import org.mockito.Matchers.{eq => mockEq, _} import org.mockito.Mockito._ import org.scalatest.mock.MockitoSugar http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilderSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilderSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilderSpec.scala index 2dd9b31..754ec2a 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilderSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderBuilderSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5 +package org.apache.toree.kernel.protocol.v5 import org.scalatest.{Matchers, FunSpec} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala index d53d64e..815dbe6 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5 +package org.apache.toree.kernel.protocol.v5 import org.scalatest.{Matchers, FunSpec} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/KMBuilderSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/KMBuilderSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/KMBuilderSpec.scala index cd5116b..6abf28b 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/KMBuilderSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/KMBuilderSpec.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.protocol.v5.content.{CommOpen, StreamContent} +import org.apache.toree.kernel.protocol.v5.content.{CommOpen, StreamContent} import org.scalatest.{Matchers, FunSpec} import play.api.libs.json._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala index 3811314..cce14e1 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.scala index 15ba4ed..f11f3f6 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.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 org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala index 74b99fe..2b294a8 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5._ class CommMsgSpec extends FunSpec with Matchers { val commMsgJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala index 3f216e9..d1bec90 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5.MsgData +import org.apache.toree.kernel.protocol.v5.MsgData class CommOpenSpec extends FunSpec with Matchers { val commOpenJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala index ab41581..7710555 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala index a3edeec..8f50386 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala index a0e6a27..5ec860d 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{Matchers, FunSpec} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala index 3738354..47b8c14 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala index 7ebfb07..2ba3f5c 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala index af64d75..c2c5568 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala index 26b03e7..bda4267 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.FunSuite import org.scalatest.{Matchers, FunSpec} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5._ class DisplayDataSpec extends FunSpec with Matchers { val displayDataJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala index 3321d1e..030f7cd 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{Matchers, FunSpec} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala index 7327785..6846836 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.scala index 5241650..60d4d3e 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.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 org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.scala index 9859d5e..97e6a10 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.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 import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5._ class ExecuteReplyErrorSpec extends FunSpec with Matchers { val executeReplyErrorJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.scala index be73811..96ddbe0 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.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 import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5._ class ExecuteReplyOkSpec extends FunSpec with Matchers { val executeReplyOkJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.scala index 24af1f2..242ff99 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.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 org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala index bb8cd71..5500b69 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{Matchers, FunSpec} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5._ class ExecuteRequestSpec extends FunSpec with Matchers { val executeRequestJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.scala index fdbe3ca..8723fea 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.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 import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5._ class ExecuteResultSpec extends FunSpec with Matchers { val executeResultJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.scala index 4e69066..d144574 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.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 import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5._ class HistoryReplySpec extends FunSpec with Matchers { val historyReplyJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala index dc775fa..55fb801 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala index a5d14b1..3356905 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala index 7b5b3db..0fe0dac 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.scala index b88a39a..c3d98fa 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.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 org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.scala index fcea013..28f07d0 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.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 import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError import play.api.libs.json._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5._ class InspectReplyOkSpec extends FunSpec with Matchers { val inspectReplyOkJson: JsValue = Json.parse(""" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala index 0ad56e9..435b34f 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala index 2ff561d..cb67fc1 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala index 7d704e2..2d07042 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala index e63b4c3..66b0830 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala index 4663d98..71fc9af 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala index 15e8eba..6ca748b 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala index fdc063d..5e9fec9 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala index 5c435a8..f60fdb9 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.content +package org.apache.toree.kernel.protocol.v5.content import org.scalatest.{FunSpec, Matchers} import play.api.data.validation.ValidationError http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/package.scala ---------------------------------------------------------------------- diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/package.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/package.scala index 0174f9b..9235d2b 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/package.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/package.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol +package org.apache.toree.kernel.protocol //import akka.zeromq.ZMQMessage -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.content.{CompleteRequest, ExecuteRequest} +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.content.{CompleteRequest, ExecuteRequest} import play.api.libs.json.Json package object v5Test { http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkBridge.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkBridge.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkBridge.scala index e0e8f60..ef7a95b 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkBridge.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkBridge.scala @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark -import com.ibm.spark.interpreter.broker.producer.{StandardSQLContextProducer, StandardJavaSparkContextProducer, SQLContextProducerLike, JavaSparkContextProducerLike} -import com.ibm.spark.interpreter.broker.{BrokerState, BrokerBridge} -import com.ibm.spark.kernel.api.KernelLike +import org.apache.toree.interpreter.broker.producer.{StandardSQLContextProducer, StandardJavaSparkContextProducer, SQLContextProducerLike, JavaSparkContextProducerLike} +import org.apache.toree.interpreter.broker.{BrokerState, BrokerBridge} +import org.apache.toree.kernel.api.KernelLike import org.apache.spark.SparkContext /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkException.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkException.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkException.scala index 664c806..23512a5 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkException.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkException.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark -import com.ibm.spark.interpreter.broker.BrokerException +import org.apache.toree.interpreter.broker.BrokerException /** * Represents a generic PySpark exception. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala index 615ed19..b0e5d2b 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark import java.net.URL -import com.ibm.spark.interpreter.Results.Result -import com.ibm.spark.interpreter._ -import com.ibm.spark.kernel.api.KernelLike +import org.apache.toree.interpreter.Results.Result +import org.apache.toree.interpreter._ +import org.apache.toree.kernel.api.KernelLike import org.apache.spark.SparkContext import org.apache.spark.sql.SQLContext import org.slf4j.LoggerFactory http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcess.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcess.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcess.scala index ace6635..13ef1c5 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcess.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcess.scala @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark import java.io.{FileOutputStream, File} -import com.ibm.spark.interpreter.broker.BrokerProcess +import org.apache.toree.interpreter.broker.BrokerProcess import org.apache.commons.exec.environment.EnvironmentUtils import org.apache.commons.exec._ import org.apache.commons.io.IOUtils http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcessHandler.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcessHandler.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcessHandler.scala index ab2aeb1..ae66d5b 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcessHandler.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkProcessHandler.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark -import com.ibm.spark.interpreter.broker.BrokerProcessHandler +import org.apache.toree.interpreter.broker.BrokerProcessHandler /** * Represents the handler for events triggered by the PySpark process. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkService.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkService.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkService.scala index ec264e2..a9b1e1f 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkService.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkService.scala @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark -import com.ibm.spark.interpreter.broker.BrokerService -import com.ibm.spark.kernel.interpreter.pyspark.PySparkTypes._ +import org.apache.toree.interpreter.broker.BrokerService +import org.apache.toree.kernel.interpreter.pyspark.PySparkTypes._ import org.apache.spark.SparkContext import org.slf4j.LoggerFactory import py4j.GatewayServer http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkState.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkState.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkState.scala index 2d0f63f..946687f 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkState.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkState.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark -import com.ibm.spark.interpreter.broker.BrokerState +import org.apache.toree.interpreter.broker.BrokerState /** * Represents the state structure of PySpark. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTransformer.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTransformer.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTransformer.scala index 146ca8e..b26b3bd 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTransformer.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTransformer.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark -import com.ibm.spark.interpreter.broker.BrokerTransformer +import org.apache.toree.interpreter.broker.BrokerTransformer /** * Represents a utility that can transform raw PySpark information to http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTypes.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTypes.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTypes.scala index 1004a1f..64e10df 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTypes.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkTypes.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.pyspark +package org.apache.toree.kernel.interpreter.pyspark -import com.ibm.spark.interpreter.broker.BrokerTypesProvider +import org.apache.toree.interpreter.broker.BrokerTypesProvider /** * Represents all types associated with the PySpark interface. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/package.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/package.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/package.scala index 618a678..f0d8760 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/package.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/package.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter +package org.apache.toree.kernel.interpreter -import com.ibm.spark.interpreter.broker.{BrokerCode, BrokerPromise} +import org.apache.toree.interpreter.broker.{BrokerCode, BrokerPromise} /** * Contains aliases to broker types. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/pyspark-interpreter/src/main/scala/org/apache/toree/magic/builtin/PySpark.scala ---------------------------------------------------------------------- diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/magic/builtin/PySpark.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/magic/builtin/PySpark.scala index a0a79b5..343caa0 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/magic/builtin/PySpark.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/magic/builtin/PySpark.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.magic.builtin +package org.apache.toree.magic.builtin -import com.ibm.spark.interpreter.{ExecuteError, ExecuteAborted} -import com.ibm.spark.kernel.interpreter.pyspark.{PySparkInterpreter, PySparkException} -import com.ibm.spark.kernel.protocol.v5.MIMEType -import com.ibm.spark.magic.{CellMagicOutput, CellMagic} -import com.ibm.spark.magic.dependencies.IncludeKernel +import org.apache.toree.interpreter.{ExecuteError, ExecuteAborted} +import org.apache.toree.kernel.interpreter.pyspark.{PySparkInterpreter, PySparkException} +import org.apache.toree.kernel.protocol.v5.MIMEType +import org.apache.toree.magic.{CellMagicOutput, CellMagic} +import org.apache.toree.magic.dependencies.IncludeKernel /** * Represents the magic interface to use the PySpark interpreter. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/resources/compile/reference.conf ---------------------------------------------------------------------- diff --git a/resources/compile/reference.conf b/resources/compile/reference.conf index a01a88c..f28e97d 100644 --- a/resources/compile/reference.conf +++ b/resources/compile/reference.conf @@ -59,8 +59,8 @@ default_interpreter = "Scala" default_interpreter = ${?DEFAULT_INTERPRETER} default_interpreter_plugin = [ - "Scala:com.ibm.spark.kernel.interpreter.scala.ScalaInterpreter", - "PySpark:com.ibm.spark.kernel.interpreter.pyspark.PySparkInterpreter", - "SparkR:com.ibm.spark.kernel.interpreter.sparkr.SparkRInterpreter", - "SQL:com.ibm.spark.kernel.interpreter.sql.SqlInterpreter" + "Scala:org.apache.toree.kernel.interpreter.scala.ScalaInterpreter", + "PySpark:org.apache.toree.kernel.interpreter.pyspark.PySparkInterpreter", + "SparkR:org.apache.toree.kernel.interpreter.sparkr.SparkRInterpreter", + "SQL:org.apache.toree.kernel.interpreter.sql.SqlInterpreter" ] http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/resources/test/reference.conf ---------------------------------------------------------------------- diff --git a/resources/test/reference.conf b/resources/test/reference.conf index 6100469..50d1d59 100644 --- a/resources/test/reference.conf +++ b/resources/test/reference.conf @@ -58,9 +58,9 @@ default_interpreter = "Scala" default_interpreter = ${?DEFAULT_INTERPRETER} default_interpreter_plugin = [ - "Scala:com.ibm.spark.kernel.interpreter.scala.ScalaInterpreter", - "PySpark:com.ibm.spark.kernel.interpreter.pyspark.PySparkInterpreter", - "SparkR:com.ibm.spark.kernel.interpreter.sparkr.SparkRInterpreter", - "SQL:com.ibm.spark.kernel.interpreter.sql.SqlInterpreter" + "Scala:org.apache.toree.kernel.interpreter.scala.ScalaInterpreter", + "PySpark:org.apache.toree.kernel.interpreter.pyspark.PySparkInterpreter", + "SparkR:org.apache.toree.kernel.interpreter.sparkr.SparkRInterpreter", + "SQL:org.apache.toree.kernel.interpreter.sql.SqlInterpreter" ] http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaException.scala ---------------------------------------------------------------------- diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaException.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaException.scala index 978cf90..c28e27f 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaException.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaException.scala @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.scala +package org.apache.toree.kernel.interpreter.scala /** * Represents a generic Scala exception. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala ---------------------------------------------------------------------- diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala index ca9bd7a..20fd410 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.scala +package org.apache.toree.kernel.interpreter.scala import java.io.{BufferedReader, ByteArrayOutputStream, InputStreamReader, PrintStream} import java.net.{URL, URLClassLoader} @@ -23,12 +23,12 @@ import java.util.concurrent.ExecutionException import akka.actor.Actor import akka.actor.Actor.Receive -import com.ibm.spark.global.StreamState -import com.ibm.spark.interpreter -import com.ibm.spark.interpreter._ -import com.ibm.spark.interpreter.imports.printers.{WrapperConsole, WrapperSystem} -import com.ibm.spark.kernel.api.{KernelLike, KernelOptions} -import com.ibm.spark.utils.{MultiOutputStream, TaskManager} +import org.apache.toree.global.StreamState +import org.apache.toree.interpreter +import org.apache.toree.interpreter._ +import org.apache.toree.interpreter.imports.printers.{WrapperConsole, WrapperSystem} +import org.apache.toree.kernel.api.{KernelLike, KernelOptions} +import org.apache.toree.utils.{MultiOutputStream, TaskManager} import org.apache.spark.SparkContext import org.apache.spark.repl.{SparkCommandLine, SparkIMain, SparkJLineCompletion} import org.apache.spark.sql.SQLContext @@ -239,7 +239,7 @@ class ScalaInterpreter() extends Interpreter { protected def bindKernelVarialble(kernel: KernelLike): Unit = { doQuietly { bind( - "kernel", "com.ibm.spark.kernel.api.Kernel", + "kernel", "org.apache.toree.kernel.api.Kernel", kernel, List( """@transient implicit""") ) } http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SettingsProducerLike.scala ---------------------------------------------------------------------- diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SettingsProducerLike.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SettingsProducerLike.scala index c6c95af..064a9ca 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SettingsProducerLike.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SettingsProducerLike.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.scala +package org.apache.toree.kernel.interpreter.scala import org.apache.spark.repl.SparkCommandLine http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SparkIMainProducerLike.scala ---------------------------------------------------------------------- diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SparkIMainProducerLike.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SparkIMainProducerLike.scala index d175b80..6a49d10 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SparkIMainProducerLike.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/SparkIMainProducerLike.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.scala +package org.apache.toree.kernel.interpreter.scala import org.apache.spark.repl.SparkIMain http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/TaskManagerProducerLike.scala ---------------------------------------------------------------------- diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/TaskManagerProducerLike.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/TaskManagerProducerLike.scala index 9025316..1acc672 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/TaskManagerProducerLike.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/TaskManagerProducerLike.scala @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.scala +package org.apache.toree.kernel.interpreter.scala -import com.ibm.spark.utils.TaskManager +import org.apache.toree.utils.TaskManager trait TaskManagerProducerLike { /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/scala-interpreter/src/main/scala/org/apache/toree/magic/builtin/Scala.scala ---------------------------------------------------------------------- diff --git a/scala-interpreter/src/main/scala/org/apache/toree/magic/builtin/Scala.scala b/scala-interpreter/src/main/scala/org/apache/toree/magic/builtin/Scala.scala index c850926..63e237b 100644 --- a/scala-interpreter/src/main/scala/org/apache/toree/magic/builtin/Scala.scala +++ b/scala-interpreter/src/main/scala/org/apache/toree/magic/builtin/Scala.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.magic.builtin +package org.apache.toree.magic.builtin -import com.ibm.spark.interpreter.{ExecuteAborted, ExecuteError} -import com.ibm.spark.kernel.interpreter.scala.{ScalaException, ScalaInterpreter} -import com.ibm.spark.kernel.protocol.v5.MIMEType -import com.ibm.spark.magic.dependencies.IncludeKernel -import com.ibm.spark.magic.{CellMagic, CellMagicOutput} +import org.apache.toree.interpreter.{ExecuteAborted, ExecuteError} +import org.apache.toree.kernel.interpreter.scala.{ScalaException, ScalaInterpreter} +import org.apache.toree.kernel.protocol.v5.MIMEType +import org.apache.toree.magic.dependencies.IncludeKernel +import org.apache.toree.magic.{CellMagic, CellMagicOutput} /** * Represents the magic interface to use the Scala interpreter. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala ---------------------------------------------------------------------- diff --git a/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala b/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala index 60cfcac..8e9a587 100644 --- a/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala +++ b/scala-interpreter/src/test/scala/integration/interpreter/scala/AddExternalJarMagicSpecForIntegration.scala @@ -18,11 +18,11 @@ package integration.interpreter.scala import java.io.{ByteArrayOutputStream, OutputStream} -import com.ibm.spark.global.StreamState -import com.ibm.spark.interpreter._ -import com.ibm.spark.kernel.api.KernelLike -import com.ibm.spark.kernel.interpreter.scala.{ScalaInterpreter, StandardSettingsProducer, StandardSparkIMainProducer, StandardTaskManagerProducer} -import com.ibm.spark.utils.{TaskManager, MultiOutputStream} +import org.apache.toree.global.StreamState +import org.apache.toree.interpreter._ +import org.apache.toree.kernel.api.KernelLike +import org.apache.toree.kernel.interpreter.scala.{ScalaInterpreter, StandardSettingsProducer, StandardSparkIMainProducer, StandardTaskManagerProducer} +import org.apache.toree.utils.{TaskManager, MultiOutputStream} import org.scalatest.mock.MockitoSugar import org.scalatest.{BeforeAndAfter, FunSpec, Matchers} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/scala-interpreter/src/test/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpec.scala ---------------------------------------------------------------------- diff --git a/scala-interpreter/src/test/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpec.scala b/scala-interpreter/src/test/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpec.scala index 1b89df3..35ea035 100644 --- a/scala-interpreter/src/test/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpec.scala +++ b/scala-interpreter/src/test/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreterSpec.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.scala +package org.apache.toree.kernel.interpreter.scala import java.io.{File, InputStream, OutputStream} import java.net.{URLClassLoader, URL} -import com.ibm.spark.interpreter.Results.Result -import com.ibm.spark.interpreter._ -import com.ibm.spark.utils.TaskManager +import org.apache.toree.interpreter.Results.Result +import org.apache.toree.interpreter._ +import org.apache.toree.utils.TaskManager import org.apache.spark.SparkConf import org.apache.spark.repl.SparkIMain import org.mockito.Matchers._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/resources/README.md ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/resources/README.md b/sparkr-interpreter/src/main/resources/README.md index 89f05f5..9b602e7 100644 --- a/sparkr-interpreter/src/main/resources/README.md +++ b/sparkr-interpreter/src/main/resources/README.md @@ -29,7 +29,7 @@ kernel to provide a form of communicate suitable for use as an interpreter: package scope of `org.apache.spark.api.r` - To circumvent, use a reflective wrapping under - `com.ibm.spark.kernel.interpreter.r.ReflectiveRBackend` + `org.apache.toree.kernel.interpreter.r.ReflectiveRBackend` Building the custom R bundle ---------------------------- http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R b/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R index 8f9f3e9..8074bbe 100644 --- a/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R +++ b/sparkr-interpreter/src/main/resources/kernelR/sparkr_runner.R @@ -47,7 +47,7 @@ sparkR.connect() # Retrieve the bridge used to perform actions on the JVM bridge <- callJStatic( - "com.ibm.spark.kernel.interpreter.sparkr.SparkRBridge", "sparkRBridge" + "org.apache.toree.kernel.interpreter.sparkr.SparkRBridge", "sparkRBridge" ) # Retrieve the state used to pull code off the JVM and push results back http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/ReflectiveRBackend.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/ReflectiveRBackend.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/ReflectiveRBackend.scala index 81cb86e..a1c6319 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/ReflectiveRBackend.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/ReflectiveRBackend.scala @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr /** * Provides reflective access into the backend R component that is not http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRBridge.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRBridge.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRBridge.scala index 44fa203..360d6c6 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRBridge.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRBridge.scala @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr -import com.ibm.spark.interpreter.broker.producer.{StandardSQLContextProducer, StandardJavaSparkContextProducer, JavaSparkContextProducerLike, SQLContextProducerLike} -import com.ibm.spark.interpreter.broker.{BrokerState, BrokerBridge} -import com.ibm.spark.kernel.api.KernelLike +import org.apache.toree.interpreter.broker.producer.{StandardSQLContextProducer, StandardJavaSparkContextProducer, JavaSparkContextProducerLike, SQLContextProducerLike} +import org.apache.toree.interpreter.broker.{BrokerState, BrokerBridge} +import org.apache.toree.kernel.api.KernelLike import org.apache.spark.SparkContext /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRException.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRException.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRException.scala index 0be8f61..1f91e0f 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRException.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRException.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr -import com.ibm.spark.interpreter.broker.BrokerException +import org.apache.toree.interpreter.broker.BrokerException /** * Represents a generic SparkR exception. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala index 45fe03c..ba49574 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr import java.net.URL -import com.ibm.spark.interpreter.Results.Result -import com.ibm.spark.interpreter._ -import com.ibm.spark.kernel.api.KernelLike +import org.apache.toree.interpreter.Results.Result +import org.apache.toree.interpreter._ +import org.apache.toree.kernel.api.KernelLike import org.apache.spark.SparkContext import org.apache.spark.sql.SQLContext import org.slf4j.LoggerFactory http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcess.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcess.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcess.scala index 2429dc4..a56cf42 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcess.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcess.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr -import com.ibm.spark.interpreter.broker.BrokerProcess +import org.apache.toree.interpreter.broker.BrokerProcess import scala.collection.JavaConverters._ /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcessHandler.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcessHandler.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcessHandler.scala index d33d265..9082598 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcessHandler.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRProcessHandler.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr -import com.ibm.spark.interpreter.broker.BrokerProcessHandler +import org.apache.toree.interpreter.broker.BrokerProcessHandler /** * Represents the handler for events triggered by the SparkR process. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRService.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRService.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRService.scala index 71731a8..928b0df 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRService.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRService.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr import java.util.concurrent.{TimeUnit, Semaphore} -import com.ibm.spark.interpreter.broker.BrokerService -import com.ibm.spark.kernel.api.KernelLike -import com.ibm.spark.kernel.interpreter.sparkr.SparkRTypes.{Code, CodeResults} +import org.apache.toree.interpreter.broker.BrokerService +import org.apache.toree.kernel.api.KernelLike +import org.apache.toree.kernel.interpreter.sparkr.SparkRTypes.{Code, CodeResults} import org.apache.spark.SparkContext import org.slf4j.LoggerFactory http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRState.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRState.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRState.scala index 60f67a3..4c7a210 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRState.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRState.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr -import com.ibm.spark.interpreter.broker.BrokerState +import org.apache.toree.interpreter.broker.BrokerState /** * Represents the state structure of SparkR. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTransformer.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTransformer.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTransformer.scala index 45c44c0..af28ac7 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTransformer.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTransformer.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr -import com.ibm.spark.interpreter.broker.BrokerTransformer +import org.apache.toree.interpreter.broker.BrokerTransformer /** * Represents the transformer used by SparkR. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTypes.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTypes.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTypes.scala index 11f33c0..2fd2663 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTypes.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRTypes.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter.sparkr +package org.apache.toree.kernel.interpreter.sparkr -import com.ibm.spark.interpreter.broker.BrokerTypesProvider +import org.apache.toree.interpreter.broker.BrokerTypesProvider /** * Represents all types associated with the SparkR interface. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/package.scala ---------------------------------------------------------------------- diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/package.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/package.scala index 872d376..c84de63 100644 --- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/package.scala +++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/package.scala @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.kernel.interpreter +package org.apache.toree.kernel.interpreter -import com.ibm.spark.interpreter.broker.{BrokerCode, BrokerPromise} +import org.apache.toree.interpreter.broker.{BrokerCode, BrokerPromise} /** * Contains aliases to broker types.
