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:43 UTC
[35/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/communication/src/main/scala/org/apache/toree/communication/socket/JeroMQSocket.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/socket/JeroMQSocket.scala b/communication/src/main/scala/org/apache/toree/communication/socket/JeroMQSocket.scala
index c95eb69..6eaf1c2 100644
--- a/communication/src/main/scala/org/apache/toree/communication/socket/JeroMQSocket.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/socket/JeroMQSocket.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
import org.zeromq.ZMsg
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/socket/PubSocketRunnable.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/socket/PubSocketRunnable.scala b/communication/src/main/scala/org/apache/toree/communication/socket/PubSocketRunnable.scala
index 43f3f3d..80599dc 100644
--- a/communication/src/main/scala/org/apache/toree/communication/socket/PubSocketRunnable.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/socket/PubSocketRunnable.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
import org.zeromq.ZMQ.{Socket, Context}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/socket/ReqSocketRunnable.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/socket/ReqSocketRunnable.scala b/communication/src/main/scala/org/apache/toree/communication/socket/ReqSocketRunnable.scala
index 0aa527f..8205068 100644
--- a/communication/src/main/scala/org/apache/toree/communication/socket/ReqSocketRunnable.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/socket/ReqSocketRunnable.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
import org.zeromq.ZMQ.{Socket, Context}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/socket/SocketLike.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/socket/SocketLike.scala b/communication/src/main/scala/org/apache/toree/communication/socket/SocketLike.scala
index 9bf752d..2c1233d 100644
--- a/communication/src/main/scala/org/apache/toree/communication/socket/SocketLike.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/socket/SocketLike.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
/**
* Represents a generic interface for socket communication.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/socket/SocketOption.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/socket/SocketOption.scala b/communication/src/main/scala/org/apache/toree/communication/socket/SocketOption.scala
index 7685239..edfc1fd 100644
--- a/communication/src/main/scala/org/apache/toree/communication/socket/SocketOption.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/socket/SocketOption.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
import org.zeromq.ZMQ
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/socket/SocketRunnable.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/socket/SocketRunnable.scala b/communication/src/main/scala/org/apache/toree/communication/socket/SocketRunnable.scala
index 6c033cc..ea2db3d 100644
--- a/communication/src/main/scala/org/apache/toree/communication/socket/SocketRunnable.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/socket/SocketRunnable.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
import java.util.concurrent.ConcurrentLinkedQueue
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/socket/SocketType.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/socket/SocketType.scala b/communication/src/main/scala/org/apache/toree/communication/socket/SocketType.scala
index 7062d85..fdb0b6d 100644
--- a/communication/src/main/scala/org/apache/toree/communication/socket/SocketType.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/socket/SocketType.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
import org.zeromq.ZMQ
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnable.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnable.scala b/communication/src/main/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnable.scala
index 6fee716..cb7a7ac 100644
--- a/communication/src/main/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnable.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnable.scala
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
-import com.ibm.spark.utils.LogLike
+import org.apache.toree.utils.LogLike
import org.zeromq.{ZMsg, ZMQ}
import org.zeromq.ZMQ.Context
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/utils/OrderedSupport.scala
----------------------------------------------------------------------
diff --git a/communication/src/main/scala/org/apache/toree/communication/utils/OrderedSupport.scala b/communication/src/main/scala/org/apache/toree/communication/utils/OrderedSupport.scala
index 8f41861..1e38573 100644
--- a/communication/src/main/scala/org/apache/toree/communication/utils/OrderedSupport.scala
+++ b/communication/src/main/scala/org/apache/toree/communication/utils/OrderedSupport.scala
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.ibm.spark.communication.utils
+package org.apache.toree.communication.utils
import akka.actor.{Actor, Stash}
-import com.ibm.spark.utils.LogLike
+import org.apache.toree.utils.LogLike
/**
* A trait to enforce ordered processing for messages of particular types.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/test/scala/integration/JeroMQSocketIntegrationSpec.scala
----------------------------------------------------------------------
diff --git a/communication/src/test/scala/integration/JeroMQSocketIntegrationSpec.scala b/communication/src/test/scala/integration/JeroMQSocketIntegrationSpec.scala
index 22cd8ec..9a5cfb8 100644
--- a/communication/src/test/scala/integration/JeroMQSocketIntegrationSpec.scala
+++ b/communication/src/test/scala/integration/JeroMQSocketIntegrationSpec.scala
@@ -18,7 +18,7 @@ package integration
import java.net.ServerSocket
import java.util.concurrent.ConcurrentLinkedDeque
-import com.ibm.spark.communication.SocketManager
+import org.apache.toree.communication.SocketManager
import org.scalatest.concurrent.Eventually
import org.scalatest.time.{Milliseconds, Span}
import org.scalatest.{Matchers, OneInstancePerTest, FunSpec}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/test/scala/integration/security/SignatureCheckerActorSpecForIntegration.scala
----------------------------------------------------------------------
diff --git a/communication/src/test/scala/integration/security/SignatureCheckerActorSpecForIntegration.scala b/communication/src/test/scala/integration/security/SignatureCheckerActorSpecForIntegration.scala
index 73bffa7..fde73b1 100644
--- a/communication/src/test/scala/integration/security/SignatureCheckerActorSpecForIntegration.scala
+++ b/communication/src/test/scala/integration/security/SignatureCheckerActorSpecForIntegration.scala
@@ -18,8 +18,8 @@ package integration.security
import akka.actor.{ActorRef, ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit}
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.communication.security.{Hmac, SignatureCheckerActor}
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.communication.security.{Hmac, SignatureCheckerActor}
import com.typesafe.config.ConfigFactory
import org.scalatest.{BeforeAndAfter, FunSpecLike, Matchers}
import play.api.libs.json.Json
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/test/scala/integration/security/SignatureManagerActorSpecForIntegration.scala
----------------------------------------------------------------------
diff --git a/communication/src/test/scala/integration/security/SignatureManagerActorSpecForIntegration.scala b/communication/src/test/scala/integration/security/SignatureManagerActorSpecForIntegration.scala
index ac7f8ce..4ee35a3 100644
--- a/communication/src/test/scala/integration/security/SignatureManagerActorSpecForIntegration.scala
+++ b/communication/src/test/scala/integration/security/SignatureManagerActorSpecForIntegration.scala
@@ -18,8 +18,8 @@ package integration.security
import akka.actor.{ActorRef, ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit}
-import com.ibm.spark.communication.security.SignatureManagerActor
-import com.ibm.spark.kernel.protocol.v5.{KernelMessage, _}
+import org.apache.toree.communication.security.SignatureManagerActor
+import org.apache.toree.kernel.protocol.v5.{KernelMessage, _}
import com.typesafe.config.ConfigFactory
import org.scalatest.{BeforeAndAfter, FunSpecLike, Matchers}
import play.api.libs.json.Json
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/test/scala/integration/security/SignatureProducerActorSpecForIntegration.scala
----------------------------------------------------------------------
diff --git a/communication/src/test/scala/integration/security/SignatureProducerActorSpecForIntegration.scala b/communication/src/test/scala/integration/security/SignatureProducerActorSpecForIntegration.scala
index 49685a8..2496164 100644
--- a/communication/src/test/scala/integration/security/SignatureProducerActorSpecForIntegration.scala
+++ b/communication/src/test/scala/integration/security/SignatureProducerActorSpecForIntegration.scala
@@ -18,8 +18,8 @@ package integration.security
import akka.actor.{ActorRef, ActorSystem, Props}
import akka.testkit.{ImplicitSender, TestKit}
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.communication.security.{Hmac, SignatureProducerActor}
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.communication.security.{Hmac, SignatureProducerActor}
import com.typesafe.config.ConfigFactory
import org.scalatest.{BeforeAndAfter, FunSpecLike, Matchers}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/test/scala/org/apache/toree/communication/security/HmacSpec.scala
----------------------------------------------------------------------
diff --git a/communication/src/test/scala/org/apache/toree/communication/security/HmacSpec.scala b/communication/src/test/scala/org/apache/toree/communication/security/HmacSpec.scala
index aee869f..dfd7b6e 100644
--- a/communication/src/test/scala/org/apache/toree/communication/security/HmacSpec.scala
+++ b/communication/src/test/scala/org/apache/toree/communication/security/HmacSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.communication.security
+package org.apache.toree.communication.security
import java.security.NoSuchAlgorithmException
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/test/scala/org/apache/toree/communication/socket/JeroMQSocketSpec.scala
----------------------------------------------------------------------
diff --git a/communication/src/test/scala/org/apache/toree/communication/socket/JeroMQSocketSpec.scala b/communication/src/test/scala/org/apache/toree/communication/socket/JeroMQSocketSpec.scala
index a052fcd..8318e06 100644
--- a/communication/src/test/scala/org/apache/toree/communication/socket/JeroMQSocketSpec.scala
+++ b/communication/src/test/scala/org/apache/toree/communication/socket/JeroMQSocketSpec.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.Answer
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/test/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnableSpec.scala
----------------------------------------------------------------------
diff --git a/communication/src/test/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnableSpec.scala b/communication/src/test/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnableSpec.scala
index 90c509c..785ae96 100644
--- a/communication/src/test/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnableSpec.scala
+++ b/communication/src/test/scala/org/apache/toree/communication/socket/ZeroMQSocketRunnableSpec.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.communication.socket
+package org.apache.toree.communication.socket
import org.scalatest.concurrent.Eventually
import org.scalatest.mock.MockitoSugar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/test/scala/org/apache/toree/communication/utils/OrderedSupportSpec.scala
----------------------------------------------------------------------
diff --git a/communication/src/test/scala/org/apache/toree/communication/utils/OrderedSupportSpec.scala b/communication/src/test/scala/org/apache/toree/communication/utils/OrderedSupportSpec.scala
index b10d4cb..c70e349 100644
--- a/communication/src/test/scala/org/apache/toree/communication/utils/OrderedSupportSpec.scala
+++ b/communication/src/test/scala/org/apache/toree/communication/utils/OrderedSupportSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.communication.utils
+package org.apache.toree.communication.utils
import akka.actor._
import akka.testkit.{ImplicitSender, TestKit}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/etc/bin/spark-kernel
----------------------------------------------------------------------
diff --git a/etc/bin/spark-kernel b/etc/bin/spark-kernel
index b827265..836201b 100755
--- a/etc/bin/spark-kernel
+++ b/etc/bin/spark-kernel
@@ -32,4 +32,4 @@ export PYTHONHASHSEED=0
exec "$SPARK_HOME"/bin/spark-submit \
${SPARK_OPTS} \
- --class com.ibm.spark.SparkKernel $PROG_HOME/lib/${KERNEL_ASSEMBLY} "$@"
+ --class org.apache.toree.SparkKernel $PROG_HOME/lib/${KERNEL_ASSEMBLY} "$@"
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/etc/bin/toree-kernel
----------------------------------------------------------------------
diff --git a/etc/bin/toree-kernel b/etc/bin/toree-kernel
index 6a3f9d1..87b4ca1 100755
--- a/etc/bin/toree-kernel
+++ b/etc/bin/toree-kernel
@@ -32,4 +32,4 @@ export PYTHONHASHSEED=0
exec "$SPARK_HOME"/bin/spark-submit \
${SPARK_OPTS} \
- --class com.ibm.spark.SparkKernel $PROG_HOME/lib/${KERNEL_ASSEMBLY} "$@"
+ --class org.apache.toree.SparkKernel $PROG_HOME/lib/${KERNEL_ASSEMBLY} "$@"
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/dependencies/DependencyDownloader.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/dependencies/DependencyDownloader.scala b/kernel-api/src/main/scala/org/apache/toree/dependencies/DependencyDownloader.scala
index 2f31cbe..292f514 100644
--- a/kernel-api/src/main/scala/org/apache/toree/dependencies/DependencyDownloader.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/dependencies/DependencyDownloader.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.dependencies
+package org.apache.toree.dependencies
import java.io.PrintStream
import java.net.URL
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/dependencies/IvyDependencyDownloader.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/dependencies/IvyDependencyDownloader.scala b/kernel-api/src/main/scala/org/apache/toree/dependencies/IvyDependencyDownloader.scala
index 2465b0e..797604f 100644
--- a/kernel-api/src/main/scala/org/apache/toree/dependencies/IvyDependencyDownloader.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/dependencies/IvyDependencyDownloader.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.dependencies
+package org.apache.toree.dependencies
import java.io.{File, PrintStream}
import java.net.URL
@@ -87,7 +87,7 @@ class IvyDependencyDownloader(repositoryUrl: String, baseDirectory: String)
ivyFile.deleteOnExit()
val md = DefaultModuleDescriptor.newDefaultInstance(
- ModuleRevisionId.newInstance("com.ibm.spark", "spark-kernel", "working")
+ ModuleRevisionId.newInstance("org.apache.toree", "spark-kernel", "working")
)
// Exclude all sources artifacts i.e. artifactId-version-sources.jar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/global/StreamState.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/global/StreamState.scala b/kernel-api/src/main/scala/org/apache/toree/global/StreamState.scala
index 973c000..57cdd63 100644
--- a/kernel-api/src/main/scala/org/apache/toree/global/StreamState.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/global/StreamState.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.global
+package org.apache.toree.global
import java.io.{InputStream, OutputStream, PrintStream}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/ExecuteFailure.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/ExecuteFailure.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/ExecuteFailure.scala
index 8103536..0148057 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/ExecuteFailure.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/ExecuteFailure.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter
+package org.apache.toree.interpreter
/**
* Represents a generic failure in execution.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
index 6200b9b..2227fea 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter
+package org.apache.toree.interpreter
import java.net.URL
-import com.ibm.spark.kernel.api.KernelLike
+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-api/src/main/scala/org/apache/toree/interpreter/InterpreterTypes.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/InterpreterTypes.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/InterpreterTypes.scala
index 7ecee65..ea68d66 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/InterpreterTypes.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/InterpreterTypes.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter
+package org.apache.toree.interpreter
/**
* Contains all types associated with the interpreter interface.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/Results.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/Results.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/Results.scala
index 8bd12d0..947f903 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/Results.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/Results.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter
+package org.apache.toree.interpreter
/**
* Represents interpreter results, mostly taken from the
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerBridge.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerBridge.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerBridge.scala
index 94b9a24..a01249e 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerBridge.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerBridge.scala
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
-import com.ibm.spark.interpreter.broker.producer.{SQLContextProducerLike, JavaSparkContextProducerLike}
-import com.ibm.spark.kernel.api.KernelLike
+import org.apache.toree.interpreter.broker.producer.{SQLContextProducerLike, JavaSparkContextProducerLike}
+import org.apache.toree.kernel.api.KernelLike
import org.apache.spark.api.java.JavaSparkContext
import org.apache.spark.sql.SQLContext
import org.apache.spark.{SparkConf, SparkContext}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerCode.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerCode.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerCode.scala
index e480aa8..399f110 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerCode.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerCode.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
import BrokerTypes._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerException.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerException.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerException.scala
index b059552..7d7b478 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerException.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerException.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
/**
* Represents a generic broker exception.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerName.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerName.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerName.scala
index 1482ade..47bccce 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerName.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerName.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
/**
* Represents the interface that associates a name with a broker. Can be
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcess.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcess.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcess.scala
index 5072b92..2150981 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcess.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcess.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
import java.io.{OutputStream, InputStream, File, FileOutputStream}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcessHandler.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcessHandler.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcessHandler.scala
index 704f974..5569fea 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcessHandler.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerProcessHandler.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
import org.apache.commons.exec.{ExecuteException, ExecuteResultHandler}
import org.slf4j.LoggerFactory
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerPromise.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerPromise.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerPromise.scala
index 3fe96bf..e7fb8a3 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerPromise.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerPromise.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
-import com.ibm.spark.interpreter.broker.BrokerTypes.{CodeResults, CodeId}
+import org.apache.toree.interpreter.broker.BrokerTypes.{CodeResults, CodeId}
import scala.concurrent.Promise
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerService.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerService.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerService.scala
index 27430af..0efc002 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerService.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerService.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
-import com.ibm.spark.interpreter.broker.BrokerTypes.{Code, CodeResults}
+import org.apache.toree.interpreter.broker.BrokerTypes.{Code, CodeResults}
import scala.concurrent.Future
/**
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerState.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerState.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerState.scala
index 409d789..cab8dbd 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerState.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerState.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
import java.util.concurrent.ConcurrentHashMap
-import com.ibm.spark.interpreter.broker.BrokerTypes._
+import org.apache.toree.interpreter.broker.BrokerTypes._
import org.slf4j.LoggerFactory
import scala.concurrent.{Future, promise}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTransformer.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTransformer.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTransformer.scala
index aa18648..7a51ca6 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTransformer.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTransformer.scala
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
-import com.ibm.spark.interpreter.InterpreterTypes.ExecuteOutput
-import com.ibm.spark.interpreter.Results.Result
-import com.ibm.spark.interpreter.broker.BrokerTypes.CodeResults
-import com.ibm.spark.interpreter.{ExecuteError, ExecuteFailure, Results}
+import org.apache.toree.interpreter.InterpreterTypes.ExecuteOutput
+import org.apache.toree.interpreter.Results.Result
+import org.apache.toree.interpreter.broker.BrokerTypes.CodeResults
+import org.apache.toree.interpreter.{ExecuteError, ExecuteFailure, Results}
import scala.concurrent.Future
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypes.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypes.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypes.scala
index 71e4d3d..56ba559 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypes.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypes.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
/**
* Represents all types associated with the broker interface.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypesProvider.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypesProvider.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypesProvider.scala
index 2af47e4..be4acd4 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypesProvider.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/BrokerTypesProvider.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
/**
* Provides broker types to the class/trait that implements this trait.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/JavaSparkContextProducerLike.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/JavaSparkContextProducerLike.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/JavaSparkContextProducerLike.scala
index cda61f3..62a1b7e 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/JavaSparkContextProducerLike.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/JavaSparkContextProducerLike.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker.producer
+package org.apache.toree.interpreter.broker.producer
import org.apache.spark.SparkContext
import org.apache.spark.api.java.JavaSparkContext
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/SQLContextProducerLike.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/SQLContextProducerLike.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/SQLContextProducerLike.scala
index fd46268..7835062 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/SQLContextProducerLike.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/broker/producer/SQLContextProducerLike.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker.producer
+package org.apache.toree.interpreter.broker.producer
import org.apache.spark.SparkContext
import org.apache.spark.sql.SQLContext
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperConsole.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperConsole.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperConsole.scala
index 42c5616..460a557 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperConsole.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperConsole.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.imports.printers
+package org.apache.toree.interpreter.imports.printers
import java.io._
-import com.ibm.spark.utils.DynamicReflectionSupport
+import org.apache.toree.utils.DynamicReflectionSupport
/**
* Represents a wrapper for the scala.Console for Scala 2.10.4 implementation.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperSystem.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperSystem.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperSystem.scala
index 4583680..11c798e 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperSystem.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/imports/printers/WrapperSystem.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.interpreter.imports.printers
+package org.apache.toree.interpreter.imports.printers
import java.io._
-import com.ibm.spark.utils.DynamicReflectionSupport
+import org.apache.toree.utils.DynamicReflectionSupport
/**
* Represents a wrapper for java.lang.System.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/interpreter/package.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/package.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/package.scala
index 451316d..37e0ddb 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/package.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/package.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark
+package org.apache.toree
// TODO: Deprecate and remove this package object as it is difficult to
// remember where this type comes from
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/kernel/api/FactoryMethodsLike.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/kernel/api/FactoryMethodsLike.scala b/kernel-api/src/main/scala/org/apache/toree/kernel/api/FactoryMethodsLike.scala
index 1642e1b..b0c33f7 100644
--- a/kernel-api/src/main/scala/org/apache/toree/kernel/api/FactoryMethodsLike.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/kernel/api/FactoryMethodsLike.scala
@@ -1,4 +1,4 @@
-package com.ibm.spark.kernel.api
+package org.apache.toree.kernel.api
import java.io.{InputStream, OutputStream}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelLike.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelLike.scala b/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelLike.scala
index c9442aa..cda8546 100644
--- a/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelLike.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelLike.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.api
+package org.apache.toree.kernel.api
import java.io.{PrintStream, InputStream, OutputStream}
@@ -92,7 +92,7 @@ trait KernelLike {
val data: java.util.Map[String, Any]
- def interpreter(name: String): Option[com.ibm.spark.interpreter.Interpreter]
+ def interpreter(name: String): Option[org.apache.toree.interpreter.Interpreter]
def config: Config
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelOptions.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelOptions.scala b/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelOptions.scala
index 00d00c9..eca1a06 100644
--- a/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelOptions.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/kernel/api/KernelOptions.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.kernel.api
+package org.apache.toree.kernel.api
object KernelOptions {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamInfo.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamInfo.scala b/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamInfo.scala
index 24cef4c..5e22b50 100644
--- a/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamInfo.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamInfo.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.kernel.api
+package org.apache.toree.kernel.api
/**
* Represents a "wrapper" for information needed to stream stdout/stderr from
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamMethodsLike.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamMethodsLike.scala b/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamMethodsLike.scala
index 4e7d9d8..f22d03a 100644
--- a/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamMethodsLike.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/kernel/api/StreamMethodsLike.scala
@@ -1,4 +1,4 @@
-package com.ibm.spark.kernel.api
+package org.apache.toree.kernel.api
/**
* Represents the methods available to stream data from the kernel to the
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/CellMagic.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/CellMagic.scala b/kernel-api/src/main/scala/org/apache/toree/magic/CellMagic.scala
index 3da1f04..0bb5b32 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/CellMagic.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/CellMagic.scala
@@ -1,4 +1,4 @@
-package com.ibm.spark.magic
+package org.apache.toree.magic
/**
* Cell Magics change the output of a cell in IPython
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala b/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala
index 349efa6..f770608 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.magic
+package org.apache.toree.magic
/**
* Represents a classloader that can load classes from within.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/LineMagic.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/LineMagic.scala b/kernel-api/src/main/scala/org/apache/toree/magic/LineMagic.scala
index 0a54e85..97a2b7d 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/LineMagic.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/LineMagic.scala
@@ -1,4 +1,4 @@
-package com.ibm.spark.magic
+package org.apache.toree.magic
/**
* Line Magics perform some function and don't return anything. I.e. you cannot
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/Magic.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/Magic.scala b/kernel-api/src/main/scala/org/apache/toree/magic/Magic.scala
index 0e41b35..091f91c 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/Magic.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/Magic.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.magic
+package org.apache.toree.magic
/**
* Represents the base structure for a magic that is loaded and executed.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/MagicExecutor.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/MagicExecutor.scala b/kernel-api/src/main/scala/org/apache/toree/magic/MagicExecutor.scala
index f74c9f6..9ca1ed5 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/MagicExecutor.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/MagicExecutor.scala
@@ -1,6 +1,6 @@
-package com.ibm.spark.magic
+package org.apache.toree.magic
-import com.ibm.spark.utils.DynamicReflectionSupport
+import org.apache.toree.utils.DynamicReflectionSupport
import scala.language.dynamics
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/MagicLoader.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/MagicLoader.scala b/kernel-api/src/main/scala/org/apache/toree/magic/MagicLoader.scala
index c700c9e..f8e026c 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/MagicLoader.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/MagicLoader.scala
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.ibm.spark.magic
+package org.apache.toree.magic
import java.net.{URL, URLClassLoader}
import com.google.common.reflect.ClassPath
-import com.ibm.spark.magic.dependencies.DependencyMap
+import org.apache.toree.magic.dependencies.DependencyMap
import scala.reflect.runtime.{universe => runtimeUniverse}
import scala.collection.JavaConversions._
@@ -29,7 +29,7 @@ class MagicLoader(
urls: Array[URL] = Array(),
parentLoader: ClassLoader = null
) extends URLClassLoader(urls, parentLoader) {
- private val magicPackage = "com.ibm.spark.magic.builtin"
+ private val magicPackage = "org.apache.toree.magic.builtin"
/**
* Checks whether a magic with a given name, implementing a given interface,
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/DependencyMap.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/DependencyMap.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/DependencyMap.scala
index f641a50..1f36e2b 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/DependencyMap.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/DependencyMap.scala
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
import java.io.OutputStream
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.kernel.api.KernelLike
-import com.ibm.spark.magic.{MagicLoader, Magic}
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.kernel.api.KernelLike
+import org.apache.toree.magic.{MagicLoader, Magic}
import com.typesafe.config.Config
import org.apache.spark.SparkContext
import org.apache.spark.sql.SQLContext
import scala.reflect.runtime.universe._
-import com.ibm.spark.dependencies.DependencyDownloader
+import org.apache.toree.dependencies.DependencyDownloader
/**
* Represents a mapping of dependency types to implementations.
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeConfig.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeConfig.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeConfig.scala
index 675c084..1b8adbd 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeConfig.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeConfig.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
-import com.ibm.spark.magic.{Magic}
+import org.apache.toree.magic.{Magic}
import com.typesafe.config.Config
trait IncludeConfig {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeDependencyDownloader.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeDependencyDownloader.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeDependencyDownloader.scala
index 109fbd1..34d87c6 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeDependencyDownloader.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeDependencyDownloader.scala
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
-import com.ibm.spark.dependencies.DependencyDownloader
-import com.ibm.spark.magic.Magic
+import org.apache.toree.dependencies.DependencyDownloader
+import org.apache.toree.magic.Magic
trait IncludeDependencyDownloader {
this: Magic =>
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeInterpreter.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeInterpreter.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeInterpreter.scala
index fb01131..477ea54 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeInterpreter.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeInterpreter.scala
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.magic.Magic
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.magic.Magic
trait IncludeInterpreter {
this: Magic =>
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernel.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernel.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernel.scala
index fca3cb1..4bace51 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernel.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernel.scala
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
-import com.ibm.spark.kernel.api.KernelLike
-import com.ibm.spark.magic.Magic
+import org.apache.toree.kernel.api.KernelLike
+import org.apache.toree.magic.Magic
trait IncludeKernel {
this: Magic =>
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernelInterpreter.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernelInterpreter.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernelInterpreter.scala
index de19c07..e1d3db6 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernelInterpreter.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeKernelInterpreter.scala
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.magic.Magic
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.magic.Magic
//@deprecated("Use IncludeInterpreter instead!", "2015.05.06")
trait IncludeKernelInterpreter {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeMagicLoader.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeMagicLoader.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeMagicLoader.scala
index 0a78508..641fade 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeMagicLoader.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeMagicLoader.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
-import com.ibm.spark.magic.{MagicLoader, Magic}
+import org.apache.toree.magic.{MagicLoader, Magic}
trait IncludeMagicLoader {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeOutputStream.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeOutputStream.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeOutputStream.scala
index a3e679e..a33838a 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeOutputStream.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeOutputStream.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
import java.io.OutputStream
-import com.ibm.spark.magic.Magic
+import org.apache.toree.magic.Magic
trait IncludeOutputStream {
this: Magic =>
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSQLContext.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSQLContext.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSQLContext.scala
index 5a9b26c..a547b2f 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSQLContext.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSQLContext.scala
@@ -1,6 +1,6 @@
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
-import com.ibm.spark.magic.Magic
+import org.apache.toree.magic.Magic
import org.apache.spark.sql.SQLContext
trait IncludeSQLContext {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSparkContext.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSparkContext.scala b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSparkContext.scala
index df5e245..68b1a16 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSparkContext.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/dependencies/IncludeSparkContext.scala
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.ibm.spark.magic.dependencies
+package org.apache.toree.magic.dependencies
-import com.ibm.spark.magic.Magic
+import org.apache.toree.magic.Magic
import org.apache.spark.SparkContext
trait IncludeSparkContext {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/magic/package.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/package.scala b/kernel-api/src/main/scala/org/apache/toree/magic/package.scala
index 292d641..cb2e51d 100644
--- a/kernel-api/src/main/scala/org/apache/toree/magic/package.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/magic/package.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark
+package org.apache.toree
package object magic {
/**
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/security/KernelSecurityManager.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/security/KernelSecurityManager.scala b/kernel-api/src/main/scala/org/apache/toree/security/KernelSecurityManager.scala
index 2529866..20c1a2e 100644
--- a/kernel-api/src/main/scala/org/apache/toree/security/KernelSecurityManager.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/security/KernelSecurityManager.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.security
+package org.apache.toree.security
import java.security.Permission
import java.util.UUID
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/ArgumentParsingSupport.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/ArgumentParsingSupport.scala b/kernel-api/src/main/scala/org/apache/toree/utils/ArgumentParsingSupport.scala
index a748fe4..c86b7dd 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/ArgumentParsingSupport.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/ArgumentParsingSupport.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import joptsimple.{OptionSpec, OptionParser}
import scala.collection.JavaConverters._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/ConditionalOutputStream.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/ConditionalOutputStream.scala b/kernel-api/src/main/scala/org/apache/toree/utils/ConditionalOutputStream.scala
index 65f7650..e458d2e 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/ConditionalOutputStream.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/ConditionalOutputStream.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.io.OutputStream
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/DownloadSupport.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/DownloadSupport.scala b/kernel-api/src/main/scala/org/apache/toree/utils/DownloadSupport.scala
index 9d36326..00b9b23 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/DownloadSupport.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/DownloadSupport.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.net.URL
import java.nio.channels._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/DynamicReflectionSupport.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/DynamicReflectionSupport.scala b/kernel-api/src/main/scala/org/apache/toree/utils/DynamicReflectionSupport.scala
index 73e02b6..ed6e0e7 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/DynamicReflectionSupport.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/DynamicReflectionSupport.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import language.dynamics
import language.existentials
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/KeyValuePairUtils.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/KeyValuePairUtils.scala b/kernel-api/src/main/scala/org/apache/toree/utils/KeyValuePairUtils.scala
index 7869aa6..e9f41b2 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/KeyValuePairUtils.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/KeyValuePairUtils.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import joptsimple.util.KeyValuePair
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala b/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala
index 9ee4da1..d4cfd1b 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.lang.reflect.Method
import java.net.{URL, URLClassLoader}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/MultiOutputStream.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/MultiOutputStream.scala b/kernel-api/src/main/scala/org/apache/toree/utils/MultiOutputStream.scala
index 6ebaf3e..e280a70 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/MultiOutputStream.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/MultiOutputStream.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.io.OutputStream
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/ScheduledTaskManager.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/ScheduledTaskManager.scala b/kernel-api/src/main/scala/org/apache/toree/utils/ScheduledTaskManager.scala
index a91e2ba..d04ebac 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/ScheduledTaskManager.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/ScheduledTaskManager.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import scala.language.existentials
import java.util.concurrent._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/main/scala/org/apache/toree/utils/TaskManager.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/TaskManager.scala b/kernel-api/src/main/scala/org/apache/toree/utils/TaskManager.scala
index c3a43fc..b0654df 100644
--- a/kernel-api/src/main/scala/org/apache/toree/utils/TaskManager.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/utils/TaskManager.scala
@@ -1,4 +1,4 @@
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.util.concurrent.atomic.AtomicInteger
@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory
import scala.concurrent.{promise, Future}
import java.util.concurrent._
-import com.ibm.spark.security.KernelSecurityManager._
+import org.apache.toree.security.KernelSecurityManager._
import TaskManager._
import scala.util.Try
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerBridgeSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerBridgeSpec.scala b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerBridgeSpec.scala
index d74867c..17d3fbf 100644
--- a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerBridgeSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerBridgeSpec.scala
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
-import com.ibm.spark.interpreter.broker.producer.{SQLContextProducerLike, JavaSparkContextProducerLike}
-import com.ibm.spark.kernel.api.KernelLike
+import org.apache.toree.interpreter.broker.producer.{SQLContextProducerLike, JavaSparkContextProducerLike}
+import org.apache.toree.kernel.api.KernelLike
import org.apache.spark.api.java.JavaSparkContext
import org.apache.spark.sql.SQLContext
import org.apache.spark.{SparkConf, SparkContext}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessHandlerSpec.scala b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessHandlerSpec.scala
index 35d3235..cef5cd2 100644
--- a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessHandlerSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessHandlerSpec.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
import org.apache.commons.exec.ExecuteException
import org.scalatest.mock.MockitoSugar
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessSpec.scala b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessSpec.scala
index 83face3..787c7fa 100644
--- a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerProcessSpec.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
import java.io.{OutputStream, InputStream, File}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerStateSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerStateSpec.scala b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerStateSpec.scala
index 84a1ae7..073ae60 100644
--- a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerStateSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerStateSpec.scala
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
import org.scalatest.{OneInstancePerTest, Matchers, FunSpec}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerTransformerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerTransformerSpec.scala b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerTransformerSpec.scala
index 266c753..7c4dbcc 100644
--- a/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerTransformerSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/interpreter/broker/BrokerTransformerSpec.scala
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ibm.spark.interpreter.broker
+package org.apache.toree.interpreter.broker
-import com.ibm.spark.interpreter.{ExecuteError, Results}
+import org.apache.toree.interpreter.{ExecuteError, Results}
import org.scalatest.concurrent.Eventually
import org.scalatest.{OneInstancePerTest, Matchers, FunSpec}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/magic/InternalClassLoaderSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/magic/InternalClassLoaderSpec.scala b/kernel-api/src/test/scala/org/apache/toree/magic/InternalClassLoaderSpec.scala
index c568c6d..1507dcf 100644
--- a/kernel-api/src/test/scala/org/apache/toree/magic/InternalClassLoaderSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/magic/InternalClassLoaderSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.magic
+package org.apache.toree.magic
import org.scalatest.{Matchers, FunSpec}
import org.scalatest.mock.MockitoSugar
@@ -29,7 +29,7 @@ class InternalClassLoaderSpec extends FunSpec with Matchers with MockitoSugar {
describe("#loadClass") {
it("should invoke super loadClass with loader's package prepended") {
val expected = classOf[Class[_]]
- val packageName = "com.ibm.spark.magic"
+ val packageName = "org.apache.toree.magic"
val className = "SomeClass"
var parentLoadClassCorrectlyInvoked = false
@@ -49,7 +49,7 @@ class InternalClassLoaderSpec extends FunSpec with Matchers with MockitoSugar {
it("should use loader's package instead of provided package first") {
val expected = classOf[Class[_]]
- val forcedPackageName = "com.ibm.spark.magic"
+ val forcedPackageName = "org.apache.toree.magic"
val packageName = "some.other.package"
val className = "SomeClass"
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/magic/MagicLoaderSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/magic/MagicLoaderSpec.scala b/kernel-api/src/test/scala/org/apache/toree/magic/MagicLoaderSpec.scala
index 0c2b894..a65b9d9 100644
--- a/kernel-api/src/test/scala/org/apache/toree/magic/MagicLoaderSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/magic/MagicLoaderSpec.scala
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package com.ibm.spark.magic
+package org.apache.toree.magic
import java.io.OutputStream
-import com.ibm.spark.dependencies.DependencyDownloader
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.magic.dependencies._
+import org.apache.toree.dependencies.DependencyDownloader
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.magic.dependencies._
import org.apache.spark.SparkContext
import org.scalatest.mock.MockitoSugar
import org.scalatest.{FunSpec, Matchers}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/utils/ArgumentParsingSupportSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/utils/ArgumentParsingSupportSpec.scala b/kernel-api/src/test/scala/org/apache/toree/utils/ArgumentParsingSupportSpec.scala
index 144e90f..67c4b35 100644
--- a/kernel-api/src/test/scala/org/apache/toree/utils/ArgumentParsingSupportSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/utils/ArgumentParsingSupportSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import org.scalatest.{BeforeAndAfter, Matchers, FunSpec}
import joptsimple.{OptionSet, OptionSpec, OptionParser}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/utils/ConditionalOutputStreamSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/utils/ConditionalOutputStreamSpec.scala b/kernel-api/src/test/scala/org/apache/toree/utils/ConditionalOutputStreamSpec.scala
index d5c4e4c..83e08cf 100644
--- a/kernel-api/src/test/scala/org/apache/toree/utils/ConditionalOutputStreamSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/utils/ConditionalOutputStreamSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.io.OutputStream
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/utils/DownloadSupportSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/utils/DownloadSupportSpec.scala b/kernel-api/src/test/scala/org/apache/toree/utils/DownloadSupportSpec.scala
index 4b0cc3d..be5eb29 100644
--- a/kernel-api/src/test/scala/org/apache/toree/utils/DownloadSupportSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/utils/DownloadSupportSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.io.FileNotFoundException
import java.net.URL
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/utils/DynamicReflectionSupportSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/utils/DynamicReflectionSupportSpec.scala b/kernel-api/src/test/scala/org/apache/toree/utils/DynamicReflectionSupportSpec.scala
index fdfe637..fe2eaf0 100644
--- a/kernel-api/src/test/scala/org/apache/toree/utils/DynamicReflectionSupportSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/utils/DynamicReflectionSupportSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.io.OutputStream
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/utils/KeyValuePairUtilsSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/utils/KeyValuePairUtilsSpec.scala b/kernel-api/src/test/scala/org/apache/toree/utils/KeyValuePairUtilsSpec.scala
index cba632d..67590c6 100644
--- a/kernel-api/src/test/scala/org/apache/toree/utils/KeyValuePairUtilsSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/utils/KeyValuePairUtilsSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import joptsimple.util.KeyValuePair
import org.scalatest.{Matchers, FunSpec}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/utils/MultiOutputStreamSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/utils/MultiOutputStreamSpec.scala b/kernel-api/src/test/scala/org/apache/toree/utils/MultiOutputStreamSpec.scala
index 185a85d..e23e09e 100644
--- a/kernel-api/src/test/scala/org/apache/toree/utils/MultiOutputStreamSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/utils/MultiOutputStreamSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.io.OutputStream
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/utils/ScheduledTaskManagerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/utils/ScheduledTaskManagerSpec.scala b/kernel-api/src/test/scala/org/apache/toree/utils/ScheduledTaskManagerSpec.scala
index 8db4535..f23e188 100644
--- a/kernel-api/src/test/scala/org/apache/toree/utils/ScheduledTaskManagerSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/utils/ScheduledTaskManagerSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.util.Calendar
import java.util.concurrent.atomic.AtomicBoolean
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel-api/src/test/scala/org/apache/toree/utils/TaskManagerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/test/scala/org/apache/toree/utils/TaskManagerSpec.scala b/kernel-api/src/test/scala/org/apache/toree/utils/TaskManagerSpec.scala
index 3456d98..23b1fa3 100644
--- a/kernel-api/src/test/scala/org/apache/toree/utils/TaskManagerSpec.scala
+++ b/kernel-api/src/test/scala/org/apache/toree/utils/TaskManagerSpec.scala
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.spark.utils
+package org.apache.toree.utils
import java.util.concurrent.{RejectedExecutionException, ExecutionException}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/main/scala/org/apache/toree/SparkKernel.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/SparkKernel.scala b/kernel/src/main/scala/org/apache/toree/SparkKernel.scala
index f532de9..1a8ac40 100644
--- a/kernel/src/main/scala/org/apache/toree/SparkKernel.scala
+++ b/kernel/src/main/scala/org/apache/toree/SparkKernel.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark
+package org.apache.toree
-import com.ibm.spark.boot.layer._
-import com.ibm.spark.boot.{CommandLineOptions, KernelBootstrap}
-import com.ibm.spark.kernel.BuildInfo
+import org.apache.toree.boot.layer._
+import org.apache.toree.boot.{CommandLineOptions, KernelBootstrap}
+import org.apache.toree.kernel.BuildInfo
object SparkKernel extends App {
private val options = new CommandLineOptions(args)
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala b/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala
index a5acbc2..d85d0b7 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/CommandLineOptions.scala
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package com.ibm.spark.boot
+package org.apache.toree.boot
import java.io.{File, OutputStream}
-import com.ibm.spark.utils.KeyValuePairUtils
+import org.apache.toree.utils.KeyValuePairUtils
import com.typesafe.config.{Config, ConfigFactory}
import joptsimple.util.KeyValuePair
import joptsimple.{OptionParser, OptionSpec}
@@ -175,9 +175,9 @@ class CommandLineOptions(args: Seq[String]) {
private def interpreterPlugins: Option[java.util.List[String]] = {
//val defaults = getAll(_default_interpreter_plugin).getOrElse(List())
//val defaults = List[String](
- // "PySpark:com.ibm.spark.kernel.interpreter.pyspark.PySparkInterpreter",
- // "SparkR:com.ibm.spark.kernel.interpreter.sparkr.SparkRInterpreter",
- // "SQL:com.ibm.spark.kernel.interpreter.sql.SqlInterpreter"
+ // "PySpark:org.apache.toree.kernel.interpreter.pyspark.PySparkInterpreter",
+ // "SparkR:org.apache.toree.kernel.interpreter.sparkr.SparkRInterpreter",
+ // "SQL:org.apache.toree.kernel.interpreter.sql.SqlInterpreter"
//)
val userDefined = getAll(_interpreter_plugin) match {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala b/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
index 1e7927c..5e97457 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package com.ibm.spark.boot
+package org.apache.toree.boot
import akka.actor.{ActorRef, ActorSystem}
-import com.ibm.spark.boot.layer._
-import com.ibm.spark.interpreter.Interpreter
-import com.ibm.spark.kernel.api.Kernel
-import com.ibm.spark.kernel.protocol.v5.KernelStatusType._
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.kernel.ActorLoader
-import com.ibm.spark.security.KernelSecurityManager
-import com.ibm.spark.utils.LogLike
+import org.apache.toree.boot.layer._
+import org.apache.toree.interpreter.Interpreter
+import org.apache.toree.kernel.api.Kernel
+import org.apache.toree.kernel.protocol.v5.KernelStatusType._
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.kernel.ActorLoader
+import org.apache.toree.security.KernelSecurityManager
+import org.apache.toree.utils.LogLike
import com.typesafe.config.Config
import org.apache.spark.SparkContext
import org.zeromq.ZMQ
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/kernel/src/main/scala/org/apache/toree/boot/layer/BareInitialization.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/layer/BareInitialization.scala b/kernel/src/main/scala/org/apache/toree/boot/layer/BareInitialization.scala
index d2d6ab9..f300659 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/layer/BareInitialization.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/layer/BareInitialization.scala
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-package com.ibm.spark.boot.layer
+package org.apache.toree.boot.layer
import akka.actor.{ActorRef, Props, ActorSystem}
-import com.ibm.spark.kernel.protocol.v5.dispatch.StatusDispatch
-import com.ibm.spark.kernel.protocol.v5.handler.{GenericSocketMessageHandler, ShutdownHandler}
-import com.ibm.spark.kernel.protocol.v5.kernel.{SimpleActorLoader, ActorLoader}
-import com.ibm.spark.communication.security.{SecurityActorType, SignatureManagerActor}
-import com.ibm.spark.kernel.protocol.v5.kernel.socket._
-import com.ibm.spark.kernel.protocol.v5._
-import com.ibm.spark.kernel.protocol.v5.content.{CommClose, CommMsg, CommOpen}
-import com.ibm.spark.kernel.protocol.v5.relay.KernelMessageRelay
-import com.ibm.spark.utils.LogLike
+import org.apache.toree.kernel.protocol.v5.dispatch.StatusDispatch
+import org.apache.toree.kernel.protocol.v5.handler.{GenericSocketMessageHandler, ShutdownHandler}
+import org.apache.toree.kernel.protocol.v5.kernel.{SimpleActorLoader, ActorLoader}
+import org.apache.toree.communication.security.{SecurityActorType, SignatureManagerActor}
+import org.apache.toree.kernel.protocol.v5.kernel.socket._
+import org.apache.toree.kernel.protocol.v5._
+import org.apache.toree.kernel.protocol.v5.content.{CommClose, CommMsg, CommOpen}
+import org.apache.toree.kernel.protocol.v5.relay.KernelMessageRelay
+import org.apache.toree.utils.LogLike
import com.typesafe.config.Config
import play.api.libs.json.Json