Renamed com.ibm.spark to org.apache.toree
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/9612a625 Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/9612a625 Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/9612a625 Branch: refs/heads/master Commit: 9612a625ac78c9def7e623238fc2f43842134f17 Parents: 68f7ddd Author: Gino Bustelo <lbust...@us.ibm.com> Authored: Fri Jan 15 11:13:06 2016 -0600 Committer: Gino Bustelo <lbust...@us.ibm.com> Committed: Fri Jan 15 11:34:05 2016 -0600 ---------------------------------------------------------------------- .../apache/toree/comm/ClientCommManager.scala | 8 ++--- .../apache/toree/comm/ClientCommWriter.scala | 12 +++---- .../kernel/protocol/v5/client/ActorLoader.scala | 2 +- .../protocol/v5/client/SparkKernelClient.scala | 22 ++++++------- .../kernel/protocol/v5/client/Utilities.scala | 10 +++--- .../v5/client/boot/ClientBootstrap.scala | 12 +++---- .../boot/layers/HandlerInitialization.scala | 12 +++---- .../boot/layers/SystemInitialization.scala | 14 ++++---- .../v5/client/exception/ShellException.scala | 2 +- .../v5/client/execution/DeferredExecution.scala | 6 ++-- .../execution/DeferredExecutionManager.scala | 6 ++-- .../execution/DeferredExecutionTuple.scala | 4 +-- .../client/execution/ExecuteRequestTuple.scala | 4 +-- .../v5/client/handler/ExecuteHandler.scala | 10 +++--- .../v5/client/socket/HeartbeatClient.scala | 10 +++--- .../protocol/v5/client/socket/IOPubClient.scala | 16 ++++----- .../protocol/v5/client/socket/ShellClient.scala | 16 ++++----- .../v5/client/socket/SocketConfig.scala | 2 +- .../v5/client/socket/SocketConnection.scala | 2 +- .../v5/client/socket/SocketFactory.scala | 4 +-- .../protocol/v5/client/socket/StdinClient.scala | 16 ++++----- client/src/test/resources/testng.yaml | 2 +- .../scala/examples/DocumentationExamples.scala | 8 ++--- .../scala/examples/ScalaSparkClientUsage.scala | 10 +++--- .../ClientToHeartbeatSpecForIntegration.scala | 8 ++--- .../ClientToIOPubSpecForIntegration.scala | 6 ++-- .../ClientToShellSpecForIntegration.scala | 6 ++-- .../toree/comm/ClientCommManagerSpec.scala | 10 +++--- .../toree/comm/ClientCommWriterSpec.scala | 8 ++--- .../v5/client/SparkKernelClientSpec.scala | 10 +++--- .../execution/DeferredExecutionTest.scala | 8 ++--- .../v5/client/socket/HeartbeatClientSpec.scala | 6 ++-- .../v5/client/socket/IOPubClientSpec.scala | 18 +++++------ .../v5/client/socket/ShellClientSpec.scala | 12 +++---- .../v5/client/socket/StdinClientSpec.scala | 16 ++++----- .../scala/system/ClientCommSpecForSystem.scala | 10 +++--- .../scala/test/utils/SparkClientDeployer.scala | 14 ++++---- .../toree/communication/SocketManager.scala | 4 +-- .../apache/toree/communication/ZMQMessage.scala | 2 +- .../actors/DealerSocketActor.scala | 6 ++-- .../communication/actors/PubSocketActor.scala | 10 +++--- .../communication/actors/RepSocketActor.scala | 6 ++-- .../communication/actors/ReqSocketActor.scala | 6 ++-- .../actors/RouterSocketActor.scala | 6 ++-- .../communication/actors/SubSocketActor.scala | 6 ++-- .../toree/communication/security/Hmac.scala | 4 +-- .../security/SignatureCheckerActor.scala | 6 ++-- .../security/SignatureManagerActor.scala | 8 ++--- .../security/SignatureProducerActor.scala | 8 ++--- .../toree/communication/security/package.scala | 2 +- .../communication/socket/JeroMQSocket.scala | 2 +- .../socket/PubSocketRunnable.scala | 2 +- .../socket/ReqSocketRunnable.scala | 2 +- .../toree/communication/socket/SocketLike.scala | 2 +- .../communication/socket/SocketOption.scala | 2 +- .../communication/socket/SocketRunnable.scala | 2 +- .../toree/communication/socket/SocketType.scala | 2 +- .../socket/ZeroMQSocketRunnable.scala | 4 +-- .../communication/utils/OrderedSupport.scala | 4 +-- .../JeroMQSocketIntegrationSpec.scala | 2 +- ...ignatureCheckerActorSpecForIntegration.scala | 4 +-- ...ignatureManagerActorSpecForIntegration.scala | 4 +-- ...gnatureProducerActorSpecForIntegration.scala | 4 +-- .../toree/communication/security/HmacSpec.scala | 2 +- .../communication/socket/JeroMQSocketSpec.scala | 2 +- .../socket/ZeroMQSocketRunnableSpec.scala | 2 +- .../utils/OrderedSupportSpec.scala | 2 +- etc/bin/spark-kernel | 2 +- etc/bin/toree-kernel | 2 +- .../dependencies/DependencyDownloader.scala | 2 +- .../dependencies/IvyDependencyDownloader.scala | 4 +-- .../org/apache/toree/global/StreamState.scala | 2 +- .../toree/interpreter/ExecuteFailure.scala | 2 +- .../apache/toree/interpreter/Interpreter.scala | 4 +-- .../toree/interpreter/InterpreterTypes.scala | 2 +- .../org/apache/toree/interpreter/Results.scala | 2 +- .../toree/interpreter/broker/BrokerBridge.scala | 6 ++-- .../toree/interpreter/broker/BrokerCode.scala | 2 +- .../interpreter/broker/BrokerException.scala | 2 +- .../toree/interpreter/broker/BrokerName.scala | 2 +- .../interpreter/broker/BrokerProcess.scala | 2 +- .../broker/BrokerProcessHandler.scala | 2 +- .../interpreter/broker/BrokerPromise.scala | 4 +-- .../interpreter/broker/BrokerService.scala | 4 +-- .../toree/interpreter/broker/BrokerState.scala | 4 +-- .../interpreter/broker/BrokerTransformer.scala | 10 +++--- .../toree/interpreter/broker/BrokerTypes.scala | 2 +- .../broker/BrokerTypesProvider.scala | 2 +- .../producer/JavaSparkContextProducerLike.scala | 2 +- .../producer/SQLContextProducerLike.scala | 2 +- .../imports/printers/WrapperConsole.scala | 4 +-- .../imports/printers/WrapperSystem.scala | 4 +-- .../org/apache/toree/interpreter/package.scala | 2 +- .../toree/kernel/api/FactoryMethodsLike.scala | 2 +- .../apache/toree/kernel/api/KernelLike.scala | 4 +-- .../apache/toree/kernel/api/KernelOptions.scala | 2 +- .../apache/toree/kernel/api/StreamInfo.scala | 2 +- .../toree/kernel/api/StreamMethodsLike.scala | 2 +- .../org/apache/toree/magic/CellMagic.scala | 2 +- .../toree/magic/InternalClassLoader.scala | 2 +- .../org/apache/toree/magic/LineMagic.scala | 2 +- .../scala/org/apache/toree/magic/Magic.scala | 2 +- .../org/apache/toree/magic/MagicExecutor.scala | 4 +-- .../org/apache/toree/magic/MagicLoader.scala | 6 ++-- .../magic/dependencies/DependencyMap.scala | 10 +++--- .../magic/dependencies/IncludeConfig.scala | 4 +-- .../IncludeDependencyDownloader.scala | 6 ++-- .../magic/dependencies/IncludeInterpreter.scala | 6 ++-- .../magic/dependencies/IncludeKernel.scala | 6 ++-- .../dependencies/IncludeKernelInterpreter.scala | 6 ++-- .../magic/dependencies/IncludeMagicLoader.scala | 4 +-- .../dependencies/IncludeOutputStream.scala | 4 +-- .../magic/dependencies/IncludeSQLContext.scala | 4 +-- .../dependencies/IncludeSparkContext.scala | 4 +-- .../scala/org/apache/toree/magic/package.scala | 2 +- .../toree/security/KernelSecurityManager.scala | 2 +- .../toree/utils/ArgumentParsingSupport.scala | 2 +- .../toree/utils/ConditionalOutputStream.scala | 2 +- .../apache/toree/utils/DownloadSupport.scala | 2 +- .../toree/utils/DynamicReflectionSupport.scala | 2 +- .../apache/toree/utils/KeyValuePairUtils.scala | 2 +- .../apache/toree/utils/MultiClassLoader.scala | 2 +- .../apache/toree/utils/MultiOutputStream.scala | 2 +- .../toree/utils/ScheduledTaskManager.scala | 2 +- .../org/apache/toree/utils/TaskManager.scala | 4 +-- .../interpreter/broker/BrokerBridgeSpec.scala | 6 ++-- .../broker/BrokerProcessHandlerSpec.scala | 2 +- .../interpreter/broker/BrokerProcessSpec.scala | 2 +- .../interpreter/broker/BrokerStateSpec.scala | 2 +- .../broker/BrokerTransformerSpec.scala | 4 +-- .../toree/magic/InternalClassLoaderSpec.scala | 6 ++-- .../apache/toree/magic/MagicLoaderSpec.scala | 8 ++--- .../utils/ArgumentParsingSupportSpec.scala | 2 +- .../utils/ConditionalOutputStreamSpec.scala | 2 +- .../toree/utils/DownloadSupportSpec.scala | 2 +- .../utils/DynamicReflectionSupportSpec.scala | 2 +- .../toree/utils/KeyValuePairUtilsSpec.scala | 2 +- .../toree/utils/MultiOutputStreamSpec.scala | 2 +- .../toree/utils/ScheduledTaskManagerSpec.scala | 2 +- .../apache/toree/utils/TaskManagerSpec.scala | 2 +- .../scala/org/apache/toree/SparkKernel.scala | 8 ++--- .../apache/toree/boot/CommandLineOptions.scala | 10 +++--- .../org/apache/toree/boot/KernelBootstrap.scala | 18 +++++------ .../toree/boot/layer/BareInitialization.scala | 20 ++++++------ .../boot/layer/ComponentInitialization.scala | 28 ++++++++-------- .../boot/layer/HandlerInitialization.scala | 30 ++++++++--------- .../toree/boot/layer/HookInitialization.scala | 8 ++--- .../toree/boot/layer/InterpreterManager.scala | 6 ++-- .../apache/toree/comm/KernelCommManager.scala | 8 ++--- .../apache/toree/comm/KernelCommWriter.scala | 12 +++---- .../toree/global/ExecuteRequestState.scala | 6 ++-- .../apache/toree/global/ExecutionCounter.scala | 4 +-- .../toree/global/ScheduledTaskManager.scala | 4 +-- .../toree/kernel/api/FactoryMethods.scala | 12 +++---- .../org/apache/toree/kernel/api/Kernel.scala | 34 ++++++++++---------- .../apache/toree/kernel/api/StreamMethods.scala | 8 ++--- .../protocol/v5/dispatch/StatusDispatch.scala | 12 +++---- .../protocol/v5/handler/BaseHandler.scala | 10 +++--- .../v5/handler/CodeCompleteHandler.scala | 10 +++--- .../protocol/v5/handler/CommCloseHandler.scala | 12 +++---- .../protocol/v5/handler/CommMsgHandler.scala | 12 +++---- .../protocol/v5/handler/CommOpenHandler.scala | 12 +++---- .../v5/handler/ExecuteRequestHandler.scala | 18 +++++------ .../handler/GenericSocketMessageHandler.scala | 12 +++---- .../v5/handler/InputRequestReplyHandler.scala | 16 ++++----- .../v5/handler/KernelInfoRequestHandler.scala | 10 +++--- .../protocol/v5/handler/ShutdownHandler.scala | 12 +++---- .../v5/interpreter/InterpreterActor.scala | 14 ++++---- .../protocol/v5/interpreter/package.scala | 2 +- .../tasks/CodeCompleteTaskActor.scala | 8 ++--- .../tasks/ExecuteRequestTaskActor.scala | 18 +++++------ .../tasks/InterpreterTaskFactory.scala | 4 +-- .../kernel/protocol/v5/kernel/ActorLoader.scala | 2 +- .../kernel/protocol/v5/kernel/Utilities.scala | 8 ++--- .../protocol/v5/kernel/socket/Control.scala | 6 ++-- .../protocol/v5/kernel/socket/Heartbeat.scala | 6 ++-- .../protocol/v5/kernel/socket/IOPub.scala | 12 +++---- .../protocol/v5/kernel/socket/Shell.scala | 6 ++-- .../v5/kernel/socket/SocketConfig.scala | 2 +- .../v5/kernel/socket/SocketConnection.scala | 2 +- .../v5/kernel/socket/SocketFactory.scala | 4 +-- .../protocol/v5/kernel/socket/Stdin.scala | 6 ++-- .../socket/ZeromqKernelMessageSocket.scala | 12 +++---- .../kernel/protocol/v5/magic/MagicParser.scala | 4 +-- .../protocol/v5/magic/PostProcessor.scala | 10 +++--- .../protocol/v5/relay/ExecuteRequestRelay.scala | 16 ++++----- .../protocol/v5/relay/KernelMessageRelay.scala | 16 ++++----- .../protocol/v5/stream/KernelInputStream.scala | 10 +++--- .../protocol/v5/stream/KernelOutputStream.scala | 10 +++--- .../apache/toree/magic/builtin/AddDeps.scala | 8 ++--- .../org/apache/toree/magic/builtin/AddJar.scala | 10 +++--- .../toree/magic/builtin/BuiltinLoader.scala | 4 +-- .../org/apache/toree/magic/builtin/Html.scala | 10 +++--- .../apache/toree/magic/builtin/JavaScript.scala | 10 +++--- .../apache/toree/magic/builtin/LSMagic.scala | 6 ++-- .../org/apache/toree/magic/builtin/RDD.scala | 14 ++++---- .../apache/toree/magic/builtin/ShowTypes.scala | 8 ++--- .../apache/toree/magic/builtin/Truncation.scala | 8 ++--- .../apache/toree/utils/MessageLogSupport.scala | 4 +-- .../org/apache/toree/utils/json/RddToJson.scala | 2 +- .../InterpreterActorSpecForIntegration.scala | 16 ++++----- .../PostProcessorSpecForIntegration.scala | 10 +++--- .../toree/boot/CommandLineOptionsSpec.scala | 2 +- .../toree/comm/KernelCommManagerSpec.scala | 10 +++--- .../toree/comm/KernelCommWriterSpec.scala | 8 ++--- .../toree/global/ExecutionCounterSpec.scala | 2 +- .../apache/toree/kernel/api/KernelSpec.scala | 18 +++++------ .../toree/kernel/api/StreamMethodsSpec.scala | 6 ++-- .../v5/dispatch/StatusDispatchSpec.scala | 8 ++--- .../v5/handler/CodeCompleteHandlerSpec.scala | 10 +++--- .../v5/handler/CommCloseHandlerSpec.scala | 12 +++---- .../v5/handler/CommMsgHandlerSpec.scala | 12 +++---- .../v5/handler/CommOpenHandlerSpec.scala | 12 +++---- .../v5/handler/ExecuteRequestHandlerSpec.scala | 12 +++---- .../GenericSocketMessageHandlerSpec.scala | 8 ++--- .../handler/InputRequestReplyHandlerSpec.scala | 8 ++--- .../handler/KernelInfoRequestHandlerSpec.scala | 8 ++--- .../tasks/ExecuteRequestTaskActorSpec.scala | 8 ++--- .../protocol/v5/kernel/ActorLoaderSpec.scala | 4 +-- .../v5/kernel/SimpleActorLoaderSpec.scala | 4 +-- .../protocol/v5/kernel/UtilitiesSpec.scala | 6 ++-- .../v5/kernel/socket/HeartbeatSpec.scala | 4 +-- .../protocol/v5/kernel/socket/IOPubSpec.scala | 8 ++--- .../protocol/v5/kernel/socket/ShellSpec.scala | 10 +++--- .../v5/kernel/socket/SocketConfigSpec.scala | 2 +- .../v5/kernel/socket/SocketConnectionSpec.scala | 2 +- .../v5/kernel/socket/SocketFactorySpec.scala | 2 +- .../protocol/v5/kernel/socket/StdinSpec.scala | 12 +++---- .../protocol/v5/magic/MagicParserSpec.scala | 4 +-- .../protocol/v5/magic/PostProcessorSpec.scala | 8 ++--- .../v5/relay/ExecuteRequestRelaySpec.scala | 16 ++++----- .../v5/relay/KernelMessageRelaySpec.scala | 12 +++---- .../v5/stream/KernelInputStreamSpec.scala | 8 ++--- .../v5/stream/KernelOuputStreamSpec.scala | 10 +++--- .../toree/magic/builtin/AddDepsSpec.scala | 20 ++++++------ .../apache/toree/magic/builtin/AddJarSpec.scala | 8 ++--- .../toree/magic/builtin/BuiltinLoaderSpec.scala | 2 +- .../apache/toree/magic/builtin/HtmlSpec.scala | 6 ++-- .../toree/magic/builtin/JavaScriptSpec.scala | 6 ++-- .../toree/magic/builtin/LSMagicSpec.scala | 8 ++--- .../apache/toree/magic/builtin/RDDSpec.scala | 10 +++--- .../apache/toree/utils/json/RddToJsonSpec.scala | 2 +- .../scala/system/KernelCommSpecForSystem.scala | 14 ++++---- .../src/test/scala/system/SuiteForSystem.scala | 2 +- .../src/test/scala/system/TruncationTests.scala | 12 +++---- .../scala/test/utils/DummyInterpreter.scala | 6 ++-- .../test/utils/NoArgSparkKernelTestKit.scala | 2 +- .../scala/test/utils/SparkKernelDeployer.scala | 20 ++++++------ .../apache/toree/annotations/Experimental.scala | 2 +- project/Build.scala | 2 +- project/Common.scala | 2 +- .../org/apache/toree/comm/CommCallbacks.scala | 8 ++--- .../org/apache/toree/comm/CommManager.scala | 12 +++---- .../org/apache/toree/comm/CommRegistrar.scala | 8 ++--- .../org/apache/toree/comm/CommStorage.scala | 6 ++-- .../org/apache/toree/comm/CommWriter.scala | 10 +++--- .../toree/kernel/protocol/v5/Header.scala | 2 +- .../kernel/protocol/v5/HeaderBuilder.scala | 2 +- .../toree/kernel/protocol/v5/KMBuilder.scala | 4 +-- .../kernel/protocol/v5/KernelMessage.scala | 2 +- .../protocol/v5/KernelMessageContent.scala | 2 +- .../kernel/protocol/v5/SparkKernelInfo.scala | 4 +-- .../protocol/v5/content/ClearOutput.scala | 4 +-- .../kernel/protocol/v5/content/CommClose.scala | 4 +-- .../protocol/v5/content/CommContent.scala | 4 +-- .../kernel/protocol/v5/content/CommMsg.scala | 4 +-- .../kernel/protocol/v5/content/CommOpen.scala | 4 +-- .../protocol/v5/content/CompleteReply.scala | 4 +-- .../protocol/v5/content/CompleteRequest.scala | 4 +-- .../protocol/v5/content/ConnectReply.scala | 4 +-- .../protocol/v5/content/ConnectRequest.scala | 4 +-- .../protocol/v5/content/DisplayData.scala | 4 +-- .../protocol/v5/content/ErrorContent.scala | 4 +-- .../protocol/v5/content/ExecuteInput.scala | 4 +-- .../protocol/v5/content/ExecuteReply.scala | 4 +-- .../protocol/v5/content/ExecuteRequest.scala | 4 +-- .../protocol/v5/content/ExecuteResult.scala | 4 +-- .../protocol/v5/content/HistoryReply.scala | 4 +-- .../protocol/v5/content/HistoryRequest.scala | 4 +-- .../kernel/protocol/v5/content/InputReply.scala | 4 +-- .../protocol/v5/content/InputRequest.scala | 4 +-- .../protocol/v5/content/InspectReply.scala | 4 +-- .../protocol/v5/content/InspectRequest.scala | 4 +-- .../protocol/v5/content/KernelInfoReply.scala | 4 +-- .../protocol/v5/content/KernelInfoRequest.scala | 4 +-- .../protocol/v5/content/KernelStatus.scala | 4 +-- .../protocol/v5/content/ShutdownReply.scala | 4 +-- .../protocol/v5/content/ShutdownRequest.scala | 4 +-- .../protocol/v5/content/StreamContent.scala | 4 +-- .../kernel/protocol/v5/content/TypeString.scala | 2 +- .../kernel/protocol/v5/content/package.scala | 2 +- .../toree/kernel/protocol/v5/package.scala | 4 +-- .../scala/org/apache/toree/utils/LogLike.scala | 2 +- .../apache/toree/comm/CommCallbacksSpec.scala | 6 ++-- .../org/apache/toree/comm/CommManagerSpec.scala | 10 +++--- .../apache/toree/comm/CommRegistrarSpec.scala | 4 +-- .../org/apache/toree/comm/CommStorageSpec.scala | 6 ++-- .../org/apache/toree/comm/CommWriterSpec.scala | 8 ++--- .../kernel/protocol/v5/HeaderBuilderSpec.scala | 2 +- .../toree/kernel/protocol/v5/HeaderSpec.scala | 2 +- .../kernel/protocol/v5/KMBuilderSpec.scala | 4 +-- .../protocol/v5/content/ClearOutputSpec.scala | 2 +- .../protocol/v5/content/CommCloseSpec.scala | 4 +-- .../protocol/v5/content/CommMsgSpec.scala | 4 +-- .../protocol/v5/content/CommOpenSpec.scala | 4 +-- .../v5/content/CompleteReplyErrorSpec.scala | 2 +- .../v5/content/CompleteReplyOkSpec.scala | 2 +- .../protocol/v5/content/CompleteReplySpec.scala | 2 +- .../v5/content/CompleteRequestSpec.scala | 2 +- .../protocol/v5/content/ConnectReplySpec.scala | 2 +- .../v5/content/ConnectRequestSpec.scala | 2 +- .../protocol/v5/content/DisplayDataSpec.scala | 4 +-- .../protocol/v5/content/ErrorContentSpec.scala | 2 +- .../protocol/v5/content/ExecuteInputSpec.scala | 2 +- .../v5/content/ExecuteReplyAbortSpec.scala | 4 +-- .../v5/content/ExecuteReplyErrorSpec.scala | 4 +-- .../v5/content/ExecuteReplyOkSpec.scala | 4 +-- .../protocol/v5/content/ExecuteReplySpec.scala | 4 +-- .../v5/content/ExecuteRequestSpec.scala | 4 +-- .../protocol/v5/content/ExecuteResultSpec.scala | 4 +-- .../protocol/v5/content/HistoryReplySpec.scala | 4 +-- .../v5/content/HistoryRequestSpec.scala | 2 +- .../protocol/v5/content/InputReplySpec.scala | 2 +- .../protocol/v5/content/InputRequestSpec.scala | 2 +- .../v5/content/InspectReplyErrorSpec.scala | 4 +-- .../v5/content/InspectReplyOkSpec.scala | 4 +-- .../protocol/v5/content/InspectReplySpec.scala | 2 +- .../v5/content/InspectRequestSpec.scala | 2 +- .../v5/content/KernelInfoReplySpec.scala | 2 +- .../v5/content/KernelInfoRequestSpec.scala | 2 +- .../protocol/v5/content/KernelStatusSpec.scala | 2 +- .../protocol/v5/content/ShutdownReplySpec.scala | 2 +- .../v5/content/ShutdownRequestSpec.scala | 2 +- .../protocol/v5/content/StreamContentSpec.scala | 2 +- .../toree/kernel/protocol/v5/package.scala | 6 ++-- .../interpreter/pyspark/PySparkBridge.scala | 8 ++--- .../interpreter/pyspark/PySparkException.scala | 4 +-- .../pyspark/PySparkInterpreter.scala | 8 ++--- .../interpreter/pyspark/PySparkProcess.scala | 4 +-- .../pyspark/PySparkProcessHandler.scala | 4 +-- .../interpreter/pyspark/PySparkService.scala | 6 ++-- .../interpreter/pyspark/PySparkState.scala | 4 +-- .../pyspark/PySparkTransformer.scala | 4 +-- .../interpreter/pyspark/PySparkTypes.scala | 4 +-- .../kernel/interpreter/pyspark/package.scala | 4 +-- .../apache/toree/magic/builtin/PySpark.scala | 12 +++---- resources/compile/reference.conf | 8 ++--- resources/test/reference.conf | 8 ++--- .../interpreter/scala/ScalaException.scala | 2 +- .../interpreter/scala/ScalaInterpreter.scala | 16 ++++----- .../scala/SettingsProducerLike.scala | 2 +- .../scala/SparkIMainProducerLike.scala | 2 +- .../scala/TaskManagerProducerLike.scala | 4 +-- .../org/apache/toree/magic/builtin/Scala.scala | 12 +++---- .../AddExternalJarMagicSpecForIntegration.scala | 10 +++--- .../scala/ScalaInterpreterSpec.scala | 8 ++--- sparkr-interpreter/src/main/resources/README.md | 2 +- .../src/main/resources/kernelR/sparkr_runner.R | 2 +- .../interpreter/sparkr/ReflectiveRBackend.scala | 2 +- .../interpreter/sparkr/SparkRBridge.scala | 8 ++--- .../interpreter/sparkr/SparkRException.scala | 4 +-- .../interpreter/sparkr/SparkRInterpreter.scala | 8 ++--- .../interpreter/sparkr/SparkRProcess.scala | 4 +-- .../sparkr/SparkRProcessHandler.scala | 4 +-- .../interpreter/sparkr/SparkRService.scala | 8 ++--- .../kernel/interpreter/sparkr/SparkRState.scala | 4 +-- .../interpreter/sparkr/SparkRTransformer.scala | 4 +-- .../kernel/interpreter/sparkr/SparkRTypes.scala | 4 +-- .../kernel/interpreter/sparkr/package.scala | 4 +-- .../org/apache/toree/magic/builtin/SparkR.scala | 12 +++---- .../kernel/interpreter/sql/SqlException.scala | 4 +-- .../kernel/interpreter/sql/SqlInterpreter.scala | 8 ++--- .../kernel/interpreter/sql/SqlService.scala | 8 ++--- .../kernel/interpreter/sql/SqlTransformer.scala | 4 +-- .../toree/kernel/interpreter/sql/SqlTypes.scala | 4 +-- .../org/apache/toree/magic/builtin/Sql.scala | 12 +++---- src/test/scala/system/StdinForSystemSpec.scala | 2 +- .../root/SparkKernelClientDeployer.scala | 4 +-- .../test.utils/root/SparkKernelDeployer.scala | 4 +-- 379 files changed, 1142 insertions(+), 1142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/comm/ClientCommManager.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/comm/ClientCommManager.scala b/client/src/main/scala/org/apache/toree/comm/ClientCommManager.scala index a3a0d88..196bc09 100644 --- a/client/src/main/scala/org/apache/toree/comm/ClientCommManager.scala +++ b/client/src/main/scala/org/apache/toree/comm/ClientCommManager.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.ibm.spark.comm +package org.apache.toree.comm -import com.ibm.spark.annotations.Experimental -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.{KMBuilder, UUID} +import org.apache.toree.annotations.Experimental +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.{KMBuilder, UUID} /** * Represents a CommManager that uses a ClientCommWriter for its underlying http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/comm/ClientCommWriter.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/comm/ClientCommWriter.scala b/client/src/main/scala/org/apache/toree/comm/ClientCommWriter.scala index 2c7f67c..5259c0f 100644 --- a/client/src/main/scala/org/apache/toree/comm/ClientCommWriter.scala +++ b/client/src/main/scala/org/apache/toree/comm/ClientCommWriter.scala @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.ibm.spark.comm +package org.apache.toree.comm -import com.ibm.spark.annotations.Experimental -import com.ibm.spark.kernel.protocol.v5 -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.content.{CommClose, CommMsg, CommOpen, CommContent} -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.annotations.Experimental +import org.apache.toree.kernel.protocol.v5 +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.content.{CommClose, CommMsg, CommOpen, CommContent} +import org.apache.toree.kernel.protocol.v5._ /** * Represents a CommWriter to send messages from the Client to the Kernel. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/ActorLoader.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/ActorLoader.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/ActorLoader.scala index 6c9dccd..4fa93bc 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/ActorLoader.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/ActorLoader.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client +package org.apache.toree.kernel.protocol.v5.client import akka.actor.{ActorRefFactory, ActorSelection} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClient.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClient.scala index 7544ee9..2e1c690 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClient.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClient.scala @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client +package org.apache.toree.kernel.protocol.v5.client import akka.actor.ActorSystem import akka.pattern.ask import akka.util.Timeout -import com.ibm.spark.comm._ -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.client.execution.{DeferredExecution, ExecuteRequestTuple} -import com.ibm.spark.kernel.protocol.v5.client.socket.HeartbeatMessage -import com.ibm.spark.kernel.protocol.v5.client.socket.StdinClient.ResponseFunction -import com.ibm.spark.kernel.protocol.v5.content.ExecuteRequest -import com.ibm.spark.utils.LogLike +import org.apache.toree.comm._ +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.client.execution.{DeferredExecution, ExecuteRequestTuple} +import org.apache.toree.kernel.protocol.v5.client.socket.HeartbeatMessage +import org.apache.toree.kernel.protocol.v5.client.socket.StdinClient.ResponseFunction +import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest +import org.apache.toree.utils.LogLike import scala.concurrent.duration._ import scala.concurrent.ExecutionContext.Implicits.global @@ -59,7 +59,7 @@ class SparkKernelClient( * client.execute("println(1)").onStream(someFunction) * </code> * someFunction will receive a - * {@link com.ibm.spark.kernel.protocol.v5.content.StreamContent} message: + * {@link org.apache.toree.kernel.protocol.v5.content.StreamContent} message: * <code> * { * "name" : "stdout", @@ -74,7 +74,7 @@ class SparkKernelClient( * client.execute("1+1").onResult(someFunction) * </code> * someFunction will receive a - * {@link com.ibm.spark.kernel.protocol.v5.content.ExecuteResult} message: + * {@link org.apache.toree.kernel.protocol.v5.content.ExecuteResult} message: * <code> * { * "execution_count" : 1, @@ -91,7 +91,7 @@ class SparkKernelClient( * client.execute("1+1").onResult(someFunction) * </code> * someFunction will be invoked with an - * {@link com.ibm.spark.kernel.protocol.v5.content.ExecuteReply} message + * {@link org.apache.toree.kernel.protocol.v5.content.ExecuteReply} message * containing the error. * * @param code Scala code http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala index 56e88c6..d31a573 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client +package org.apache.toree.kernel.protocol.v5.client import java.nio.charset.Charset import akka.util.{ByteString, Timeout} -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.content.ExecuteRequest -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest +import org.apache.toree.utils.LogLike import play.api.data.validation.ValidationError import play.api.libs.json.{JsPath, Json, Reads} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/ClientBootstrap.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/ClientBootstrap.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/ClientBootstrap.scala index e75f7dd..33cc20f 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/ClientBootstrap.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/ClientBootstrap.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.boot +package org.apache.toree.kernel.protocol.v5.client.boot import akka.actor.ActorSystem -import com.ibm.spark.comm.{CommRegistrar, CommStorage} -import com.ibm.spark.kernel.protocol.v5.client.boot.layers._ -import com.ibm.spark.kernel.protocol.v5.client.socket.{SocketConfig, SocketFactory} -import com.ibm.spark.kernel.protocol.v5.client.{SimpleActorLoader, SparkKernelClient} -import com.ibm.spark.utils.LogLike +import org.apache.toree.comm.{CommRegistrar, CommStorage} +import org.apache.toree.kernel.protocol.v5.client.boot.layers._ +import org.apache.toree.kernel.protocol.v5.client.socket.{SocketConfig, SocketFactory} +import org.apache.toree.kernel.protocol.v5.client.{SimpleActorLoader, SparkKernelClient} +import org.apache.toree.utils.LogLike import com.typesafe.config.Config import org.zeromq.ZMQ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/HandlerInitialization.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/HandlerInitialization.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/HandlerInitialization.scala index 57a294a..a379a29 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/HandlerInitialization.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/HandlerInitialization.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.boot.layers +package org.apache.toree.kernel.protocol.v5.client.boot.layers import akka.actor.{ActorSystem, Props} -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.MessageType -import com.ibm.spark.kernel.protocol.v5.MessageType.MessageType -import com.ibm.spark.kernel.protocol.v5.client.handler.ExecuteHandler -import com.ibm.spark.utils.LogLike +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.MessageType +import org.apache.toree.kernel.protocol.v5.MessageType.MessageType +import org.apache.toree.kernel.protocol.v5.client.handler.ExecuteHandler +import org.apache.toree.utils.LogLike /** * Represents the event handler initialization such as message handlers. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/SystemInitialization.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/SystemInitialization.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/SystemInitialization.scala index 945017c..329841e 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/SystemInitialization.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/boot/layers/SystemInitialization.scala @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.boot.layers +package org.apache.toree.kernel.protocol.v5.client.boot.layers import akka.actor.{Props, ActorRef, ActorSystem} -import com.ibm.spark.comm.{CommRegistrar, CommStorage} -import com.ibm.spark.communication.security.{SecurityActorType, SignatureManagerActor} -import com.ibm.spark.kernel.protocol.v5.SocketType -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.client.socket._ -import com.ibm.spark.utils.LogLike +import org.apache.toree.comm.{CommRegistrar, CommStorage} +import org.apache.toree.communication.security.{SecurityActorType, SignatureManagerActor} +import org.apache.toree.kernel.protocol.v5.SocketType +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.client.socket._ +import org.apache.toree.utils.LogLike import com.typesafe.config.Config /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/exception/ShellException.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/exception/ShellException.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/exception/ShellException.scala index 6bb89ba..38936b5 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/exception/ShellException.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/exception/ShellException.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.exception +package org.apache.toree.kernel.protocol.v5.client.exception class ShellException(e: Throwable) extends Throwable { val exception: Throwable = e http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecution.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecution.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecution.scala index c6e7f86..32815f5 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecution.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecution.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.execution +package org.apache.toree.kernel.protocol.v5.client.execution -import com.ibm.spark.kernel.protocol.v5.content._ -import com.ibm.spark.utils.LogLike +import org.apache.toree.kernel.protocol.v5.content._ +import org.apache.toree.utils.LogLike case class DeferredExecution() extends LogLike { private var executeResultCallbacks: List[(ExecuteResult) => Unit] = Nil http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionManager.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionManager.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionManager.scala index 3c7489b..3154222 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionManager.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionManager.scala @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.execution +package org.apache.toree.kernel.protocol.v5.client.execution -import com.ibm.spark.kernel.protocol.v5.UUID -import com.ibm.spark.utils.LogLike +import org.apache.toree.kernel.protocol.v5.UUID +import org.apache.toree.utils.LogLike import scala.collection.concurrent.{Map, TrieMap} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTuple.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTuple.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTuple.scala index b9b1e5e..0049407 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTuple.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTuple.scala @@ -14,8 +14,8 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.execution +package org.apache.toree.kernel.protocol.v5.client.execution -import com.ibm.spark.kernel.protocol.v5.UUID +import org.apache.toree.kernel.protocol.v5.UUID case class DeferredExecutionTuple ( id: UUID, de: DeferredExecution) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/ExecuteRequestTuple.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/ExecuteRequestTuple.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/ExecuteRequestTuple.scala index 6c8c751..044197f 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/ExecuteRequestTuple.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/execution/ExecuteRequestTuple.scala @@ -14,8 +14,8 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.execution +package org.apache.toree.kernel.protocol.v5.client.execution -import com.ibm.spark.kernel.protocol.v5.content.ExecuteRequest +import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest case class ExecuteRequestTuple(request: ExecuteRequest, de: DeferredExecution) http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/handler/ExecuteHandler.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/handler/ExecuteHandler.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/handler/ExecuteHandler.scala index 57d8e85..d7b7c9f 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/handler/ExecuteHandler.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/handler/ExecuteHandler.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.handler +package org.apache.toree.kernel.protocol.v5.client.handler import akka.actor.Actor import akka.util.Timeout -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.client.{ActorLoader, Utilities} -import com.ibm.spark.kernel.protocol.v5.client.execution.{ExecuteRequestTuple, DeferredExecutionManager} -import com.ibm.spark.utils.LogLike +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, Utilities} +import org.apache.toree.kernel.protocol.v5.client.execution.{ExecuteRequestTuple, DeferredExecutionManager} +import org.apache.toree.utils.LogLike import scala.concurrent.duration._ /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClient.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClient.scala index 6dafbcd..efd7eb8 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClient.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClient.scala @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import akka.actor.{ActorRef, Actor} import akka.util.{ByteString, Timeout} -import com.ibm.spark.communication.ZMQMessage +import org.apache.toree.communication.ZMQMessage import akka.pattern.ask -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.utils.LogLike -import com.ibm.spark.kernel.protocol.v5.UUID +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.utils.LogLike +import org.apache.toree.kernel.protocol.v5.UUID import scala.collection.concurrent.{Map, TrieMap} import scala.concurrent.duration._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClient.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClient.scala index b183a23..ca4b10d 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClient.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClient.scala @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import akka.actor.Actor -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.comm.{CommStorage, CommRegistrar, ClientCommWriter} -import com.ibm.spark.kernel.protocol.v5.client.{ActorLoader, Utilities} +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.comm.{CommStorage, CommRegistrar, ClientCommWriter} +import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, Utilities} import Utilities._ -import com.ibm.spark.kernel.protocol.v5.client.execution.DeferredExecutionManager -import com.ibm.spark.kernel.protocol.v5.content._ -import com.ibm.spark.kernel.protocol.v5.{KMBuilder, KernelMessage} -import com.ibm.spark.utils.LogLike +import org.apache.toree.kernel.protocol.v5.client.execution.DeferredExecutionManager +import org.apache.toree.kernel.protocol.v5.content._ +import org.apache.toree.kernel.protocol.v5.{KMBuilder, KernelMessage} +import org.apache.toree.utils.LogLike import scala.util.Failure http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClient.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClient.scala index bf504af..ab3f478 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClient.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClient.scala @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import akka.actor.Actor import akka.util.Timeout -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.communication.security.SecurityActorType -import com.ibm.spark.kernel.protocol.v5.client.{ActorLoader, Utilities} -import com.ibm.spark.kernel.protocol.v5.{KernelMessage, UUID} +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.communication.security.SecurityActorType +import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, Utilities} +import org.apache.toree.kernel.protocol.v5.{KernelMessage, UUID} import Utilities._ -import com.ibm.spark.kernel.protocol.v5.client.execution.{DeferredExecution, DeferredExecutionManager} -import com.ibm.spark.kernel.protocol.v5.content.ExecuteReply +import org.apache.toree.kernel.protocol.v5.client.execution.{DeferredExecution, DeferredExecutionManager} +import org.apache.toree.kernel.protocol.v5.content.ExecuteReply -import com.ibm.spark.utils.LogLike +import org.apache.toree.utils.LogLike import scala.concurrent.Await import scala.concurrent.duration._ import akka.pattern.ask http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConfig.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConfig.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConfig.scala index 6f3789d..14f21fd 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConfig.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConfig.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import com.typesafe.config.Config import play.api.libs.json.Json http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConnection.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConnection.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConnection.scala index fae1d0e..da9b02a 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConnection.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketConnection.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket object SocketConnection { def apply(protocol: String, ip: String, port: Int) = http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketFactory.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketFactory.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketFactory.scala index 07b05d7..087cdbc 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketFactory.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/SocketFactory.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import java.util.UUID import akka.actor.{Props, ActorRef, ActorSystem} -import com.ibm.spark.communication.actors.{DealerSocketActor, ReqSocketActor, SubSocketActor} +import org.apache.toree.communication.actors.{DealerSocketActor, ReqSocketActor, SubSocketActor} object SocketFactory { def apply(socketConfig: SocketConfig) = { http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClient.scala ---------------------------------------------------------------------- diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClient.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClient.scala index 22c6071..e70ec32 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClient.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClient.scala @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import akka.actor.Actor -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.communication.security.SecurityActorType -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.{HeaderBuilder, KMBuilder, KernelMessage} -import com.ibm.spark.kernel.protocol.v5.content.{InputReply, InputRequest} -import com.ibm.spark.utils.LogLike -import com.ibm.spark.kernel.protocol.v5.client.Utilities._ +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.communication.security.SecurityActorType +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.{HeaderBuilder, KMBuilder, KernelMessage} +import org.apache.toree.kernel.protocol.v5.content.{InputReply, InputRequest} +import org.apache.toree.utils.LogLike +import org.apache.toree.kernel.protocol.v5.client.Utilities._ import play.api.libs.json.Json import StdinClient._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/resources/testng.yaml ---------------------------------------------------------------------- diff --git a/client/src/test/resources/testng.yaml b/client/src/test/resources/testng.yaml index 4b9266d..b1ec4c8 100644 --- a/client/src/test/resources/testng.yaml +++ b/client/src/test/resources/testng.yaml @@ -21,4 +21,4 @@ parameters: { } tests: - name: KernelClientTests packages: - - "com.ibm.spark.kernel.client.*" + - "org.apache.toree.kernel.client.*" http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/examples/DocumentationExamples.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/examples/DocumentationExamples.scala b/client/src/test/scala/examples/DocumentationExamples.scala index cc390e2..dd2a8f7 100644 --- a/client/src/test/scala/examples/DocumentationExamples.scala +++ b/client/src/test/scala/examples/DocumentationExamples.scala @@ -16,10 +16,10 @@ package examples -import com.ibm.spark.kernel.protocol.v5.MIMEType -import com.ibm.spark.kernel.protocol.v5.client.boot.ClientBootstrap -import com.ibm.spark.kernel.protocol.v5.client.boot.layers.{StandardHandlerInitialization, StandardSystemInitialization} -import com.ibm.spark.kernel.protocol.v5.content._ +import org.apache.toree.kernel.protocol.v5.MIMEType +import org.apache.toree.kernel.protocol.v5.client.boot.ClientBootstrap +import org.apache.toree.kernel.protocol.v5.client.boot.layers.{StandardHandlerInitialization, StandardSystemInitialization} +import org.apache.toree.kernel.protocol.v5.content._ import com.typesafe.config.{Config, ConfigFactory} object DocumentationExamples extends App { http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/examples/ScalaSparkClientUsage.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/examples/ScalaSparkClientUsage.scala b/client/src/test/scala/examples/ScalaSparkClientUsage.scala index 7632049..6d38c43 100644 --- a/client/src/test/scala/examples/ScalaSparkClientUsage.scala +++ b/client/src/test/scala/examples/ScalaSparkClientUsage.scala @@ -17,11 +17,11 @@ package examples import java.io.File -import com.ibm.spark.kernel.protocol.v5.MIMEType -import com.ibm.spark.kernel.protocol.v5.client.boot.ClientBootstrap -import com.ibm.spark.kernel.protocol.v5.client.boot.layers.{StandardHandlerInitialization, StandardSystemInitialization} -import com.ibm.spark.kernel.protocol.v5.content.{ExecuteResult} -import com.ibm.spark.kernel.protocol.v5.content._ +import org.apache.toree.kernel.protocol.v5.MIMEType +import org.apache.toree.kernel.protocol.v5.client.boot.ClientBootstrap +import org.apache.toree.kernel.protocol.v5.client.boot.layers.{StandardHandlerInitialization, StandardSystemInitialization} +import org.apache.toree.kernel.protocol.v5.content.{ExecuteResult} +import org.apache.toree.kernel.protocol.v5.content._ import com.typesafe.config.{ConfigFactory, Config} import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Promise http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/integration/unused.integration.socket/ClientToHeartbeatSpecForIntegration.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/integration/unused.integration.socket/ClientToHeartbeatSpecForIntegration.scala b/client/src/test/scala/integration/unused.integration.socket/ClientToHeartbeatSpecForIntegration.scala index 9b22823..dc6c047 100644 --- a/client/src/test/scala/integration/unused.integration.socket/ClientToHeartbeatSpecForIntegration.scala +++ b/client/src/test/scala/integration/unused.integration.socket/ClientToHeartbeatSpecForIntegration.scala @@ -23,10 +23,10 @@ import akka.actor.{ActorRef, ActorSystem, Props} import akka.pattern.ask import akka.testkit.{ImplicitSender, TestKit, TestProbe} import akka.util.Timeout -import com.ibm.spark.kernel.protocol.v5.client.ZMQMessage -import com.ibm.spark.kernel.protocol.v5.SocketType -import com.ibm.spark.kernel.protocol.v5.socket._ -import com.ibm.spark.kernel.protocol.v5.socket.SocketConfig +import org.apache.toree.kernel.protocol.v5.client.ZMQMessage +import org.apache.toree.kernel.protocol.v5.SocketType +import org.apache.toree.kernel.protocol.v5.socket._ +import org.apache.toree.kernel.protocol.v5.socket.SocketConfig import com.typesafe.config.ConfigFactory import org.mockito.Matchers._ import org.mockito.Mockito._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/integration/unused.integration.socket/ClientToIOPubSpecForIntegration.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/integration/unused.integration.socket/ClientToIOPubSpecForIntegration.scala b/client/src/test/scala/integration/unused.integration.socket/ClientToIOPubSpecForIntegration.scala index 557630e..b4fe468 100644 --- a/client/src/test/scala/integration/unused.integration.socket/ClientToIOPubSpecForIntegration.scala +++ b/client/src/test/scala/integration/unused.integration.socket/ClientToIOPubSpecForIntegration.scala @@ -21,9 +21,9 @@ import java.util.UUID import akka.actor.{ActorRef, ActorSystem, Props} import akka.testkit.{ImplicitSender, TestKit, TestProbe} -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.content.ExecuteResult -import com.ibm.spark.kernel.protocol.v5.socket._ +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.content.ExecuteResult +import org.apache.toree.kernel.protocol.v5.socket._ import org.mockito.Matchers._ import org.mockito.Mockito._ import org.scalatest.mock.MockitoSugar http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/integration/unused.integration.socket/ClientToShellSpecForIntegration.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/integration/unused.integration.socket/ClientToShellSpecForIntegration.scala b/client/src/test/scala/integration/unused.integration.socket/ClientToShellSpecForIntegration.scala index 978ffd5..cc4372b 100644 --- a/client/src/test/scala/integration/unused.integration.socket/ClientToShellSpecForIntegration.scala +++ b/client/src/test/scala/integration/unused.integration.socket/ClientToShellSpecForIntegration.scala @@ -22,9 +22,9 @@ import java.util.UUID import akka.actor.{ActorRef, ActorSystem, Props} import akka.testkit.{ImplicitSender, TestKit, TestProbe} import akka.zeromq._ -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.content.ExecuteRequest -import com.ibm.spark.kernel.protocol.v5.socket._ +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest +import org.apache.toree.kernel.protocol.v5.socket._ import org.mockito.Matchers._ import org.mockito.Mockito._ import org.scalatest.mock.MockitoSugar http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/org/apache/toree/comm/ClientCommManagerSpec.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/org/apache/toree/comm/ClientCommManagerSpec.scala b/client/src/test/scala/org/apache/toree/comm/ClientCommManagerSpec.scala index 85ef4aa..ca0cde7 100644 --- a/client/src/test/scala/org/apache/toree/comm/ClientCommManagerSpec.scala +++ b/client/src/test/scala/org/apache/toree/comm/ClientCommManagerSpec.scala @@ -14,12 +14,12 @@ * 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._ -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.content.CommContent +import org.apache.toree.kernel.protocol.v5 +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.content.CommContent import org.scalatest.mock.MockitoSugar import org.mockito.Mockito._ import org.mockito.Matchers._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/org/apache/toree/comm/ClientCommWriterSpec.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/org/apache/toree/comm/ClientCommWriterSpec.scala b/client/src/test/scala/org/apache/toree/comm/ClientCommWriterSpec.scala index f5a4b43..3c795e5 100644 --- a/client/src/test/scala/org/apache/toree/comm/ClientCommWriterSpec.scala +++ b/client/src/test/scala/org/apache/toree/comm/ClientCommWriterSpec.scala @@ -13,15 +13,15 @@ * 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 akka.actor.{ActorSelection, ActorSystem} import akka.testkit.{TestKit, TestProbe} -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.content._ +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.content._ import com.typesafe.config.ConfigFactory import org.mockito.Matchers._ import org.mockito.Mockito._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClientSpec.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClientSpec.scala b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClientSpec.scala index 8db29f8..2683c87 100644 --- a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClientSpec.scala +++ b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/SparkKernelClientSpec.scala @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client +package org.apache.toree.kernel.protocol.v5.client import akka.actor.ActorSystem import akka.testkit.{TestKit, TestProbe} -import com.ibm.spark.comm.{CommCallbacks, CommStorage, CommRegistrar} -import com.ibm.spark.kernel.protocol.v5 -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.client.execution.ExecuteRequestTuple +import org.apache.toree.comm.{CommCallbacks, CommStorage, CommRegistrar} +import org.apache.toree.kernel.protocol.v5 +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.client.execution.ExecuteRequestTuple import scala.concurrent.duration._ import org.mockito.Mockito._ import org.mockito.Matchers.{eq => mockEq, _} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTest.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTest.scala b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTest.scala index db3205c..655bed3 100644 --- a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTest.scala +++ b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/execution/DeferredExecutionTest.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.execution +package org.apache.toree.kernel.protocol.v5.client.execution -import com.ibm.spark.kernel.protocol.v5.content.{StreamContent, ExecuteResult} -import com.ibm.spark.kernel.protocol.v5.content._ -import com.ibm.spark.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.content.{StreamContent, ExecuteResult} +import org.apache.toree.kernel.protocol.v5.content._ +import org.apache.toree.kernel.protocol.v5._ import org.scalatest.{Matchers, FunSpec} import org.scalatest.concurrent.ScalaFutures http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClientSpec.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClientSpec.scala b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClientSpec.scala index 9fdd702..0755785 100644 --- a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClientSpec.scala +++ b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/HeartbeatClientSpec.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import akka.actor.{ActorRef, ActorSystem, Props} import akka.testkit.{TestProbe, ImplicitSender, TestKit} -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.kernel.protocol.v5.client.ActorLoader import org.scalatest.mock.MockitoSugar import org.scalatest.{Matchers, FunSpecLike} import org.mockito.Matchers._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClientSpec.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClientSpec.scala b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClientSpec.scala index b592dcd..99c2914 100644 --- a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClientSpec.scala +++ b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/IOPubClientSpec.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import java.util.UUID @@ -22,14 +22,14 @@ import akka.actor.{ActorRef, ActorSystem, Props} import akka.pattern.ask import akka.testkit.{ImplicitSender, TestKit, TestProbe} import akka.util.Timeout -import com.ibm.spark.comm.{CommCallbacks, CommRegistrar, CommStorage, CommWriter} -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.kernel.protocol.v5 -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.client.Utilities._ -import com.ibm.spark.kernel.protocol.v5.client.execution.{DeferredExecution, DeferredExecutionManager} -import com.ibm.spark.kernel.protocol.v5.client.{ActorLoader, Utilities} -import com.ibm.spark.kernel.protocol.v5.content.{CommClose, CommMsg, CommOpen, StreamContent} +import org.apache.toree.comm.{CommCallbacks, CommRegistrar, CommStorage, CommWriter} +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.kernel.protocol.v5 +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.client.Utilities._ +import org.apache.toree.kernel.protocol.v5.client.execution.{DeferredExecution, DeferredExecutionManager} +import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, Utilities} +import org.apache.toree.kernel.protocol.v5.content.{CommClose, CommMsg, CommOpen, StreamContent} import com.typesafe.config.ConfigFactory import org.mockito.Matchers.{eq => mockEq, _} import org.mockito.Mockito._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClientSpec.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClientSpec.scala b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClientSpec.scala index 0110dfd..6c88605 100644 --- a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClientSpec.scala +++ b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/ShellClientSpec.scala @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import java.util.UUID import akka.actor.{ActorRef, ActorSystem, Props} import akka.testkit.{TestProbe, ImplicitSender, TestKit} -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.communication.security.SecurityActorType -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.content.ExecuteRequest +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.communication.security.SecurityActorType +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest import org.scalatest.mock.MockitoSugar import org.scalatest.{Matchers, FunSpecLike} import org.mockito.Mockito._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala index 877c4f5..a3a48b7 100644 --- a/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala +++ b/client/src/test/scala/org/apache/toree/kernel/protocol/v5/client/socket/StdinClientSpec.scala @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.ibm.spark.kernel.protocol.v5.client.socket +package org.apache.toree.kernel.protocol.v5.client.socket import akka.actor.{ActorRef, Props, ActorSystem} import akka.testkit.{TestProbe, ImplicitSender, TestKit} -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.communication.security.SecurityActorType -import com.ibm.spark.kernel.protocol.v5._ -import com.ibm.spark.kernel.protocol.v5.client.ActorLoader -import com.ibm.spark.kernel.protocol.v5.client.socket.StdinClient.ResponseFunction -import com.ibm.spark.kernel.protocol.v5.content.{InputReply, InputRequest, ClearOutput, ExecuteRequest} +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.communication.security.SecurityActorType +import org.apache.toree.kernel.protocol.v5._ +import org.apache.toree.kernel.protocol.v5.client.ActorLoader +import org.apache.toree.kernel.protocol.v5.client.socket.StdinClient.ResponseFunction +import org.apache.toree.kernel.protocol.v5.content.{InputReply, InputRequest, ClearOutput, ExecuteRequest} import org.scalatest.mock.MockitoSugar import org.scalatest.{BeforeAndAfter, FunSpecLike, Matchers} -import com.ibm.spark.kernel.protocol.v5.client.Utilities._ +import org.apache.toree.kernel.protocol.v5.client.Utilities._ import play.api.libs.json.Json import scala.concurrent.duration._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/system/ClientCommSpecForSystem.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/system/ClientCommSpecForSystem.scala b/client/src/test/scala/system/ClientCommSpecForSystem.scala index 164c4c0..c8e98be 100644 --- a/client/src/test/scala/system/ClientCommSpecForSystem.scala +++ b/client/src/test/scala/system/ClientCommSpecForSystem.scala @@ -17,11 +17,11 @@ package system import akka.testkit.{TestKit, TestProbe} -import com.ibm.spark.communication.ZMQMessage -import com.ibm.spark.kernel.protocol.v5 -import com.ibm.spark.kernel.protocol.v5.client.Utilities._ -import com.ibm.spark.kernel.protocol.v5.content._ -import com.ibm.spark.kernel.protocol.v5.{KMBuilder, KernelMessage, SocketType} +import org.apache.toree.communication.ZMQMessage +import org.apache.toree.kernel.protocol.v5 +import org.apache.toree.kernel.protocol.v5.client.Utilities._ +import org.apache.toree.kernel.protocol.v5.content._ +import org.apache.toree.kernel.protocol.v5.{KMBuilder, KernelMessage, SocketType} import org.scalatest.concurrent.Eventually import org.scalatest.exceptions.TestFailedDueToTimeoutException import org.scalatest.time.{Milliseconds, Seconds, Span} http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/client/src/test/scala/test/utils/SparkClientDeployer.scala ---------------------------------------------------------------------- diff --git a/client/src/test/scala/test/utils/SparkClientDeployer.scala b/client/src/test/scala/test/utils/SparkClientDeployer.scala index 8edccfb..beebd0c 100644 --- a/client/src/test/scala/test/utils/SparkClientDeployer.scala +++ b/client/src/test/scala/test/utils/SparkClientDeployer.scala @@ -18,13 +18,13 @@ package test.utils import akka.actor.{Actor, Props, ActorRef, ActorSystem} import akka.testkit.TestProbe -import com.ibm.spark.comm.{CommRegistrar, CommStorage} -import com.ibm.spark.kernel.protocol.v5.client.socket._ -import com.ibm.spark.kernel.protocol.v5.client.{ActorLoader, SparkKernelClient} -import com.ibm.spark.kernel.protocol.v5.client.boot.ClientBootstrap -import com.ibm.spark.kernel.protocol.v5.client.boot.layers.{StandardHandlerInitialization, StandardSystemInitialization} -import com.ibm.spark.kernel.protocol.v5.SocketType -import com.ibm.spark.utils.LogLike +import org.apache.toree.comm.{CommRegistrar, CommStorage} +import org.apache.toree.kernel.protocol.v5.client.socket._ +import org.apache.toree.kernel.protocol.v5.client.{ActorLoader, SparkKernelClient} +import org.apache.toree.kernel.protocol.v5.client.boot.ClientBootstrap +import org.apache.toree.kernel.protocol.v5.client.boot.layers.{StandardHandlerInitialization, StandardSystemInitialization} +import org.apache.toree.kernel.protocol.v5.SocketType +import org.apache.toree.utils.LogLike import com.typesafe.config.{Config, ConfigFactory} /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/SocketManager.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/SocketManager.scala b/communication/src/main/scala/org/apache/toree/communication/SocketManager.scala index 994360f..bb75df7 100644 --- a/communication/src/main/scala/org/apache/toree/communication/SocketManager.scala +++ b/communication/src/main/scala/org/apache/toree/communication/SocketManager.scala @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.communication +package org.apache.toree.communication import java.util.UUID import java.util.concurrent.ConcurrentHashMap -import com.ibm.spark.communication.socket._ +import org.apache.toree.communication.socket._ import org.zeromq.ZMQ import scala.collection.JavaConverters._ http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/ZMQMessage.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/ZMQMessage.scala b/communication/src/main/scala/org/apache/toree/communication/ZMQMessage.scala index ffa7705..fee8dd3 100644 --- a/communication/src/main/scala/org/apache/toree/communication/ZMQMessage.scala +++ b/communication/src/main/scala/org/apache/toree/communication/ZMQMessage.scala @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.communication +package org.apache.toree.communication import akka.util.ByteString http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/actors/DealerSocketActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/DealerSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/DealerSocketActor.scala index 0f0497d..16d8b76 100644 --- a/communication/src/main/scala/org/apache/toree/communication/actors/DealerSocketActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/actors/DealerSocketActor.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.communication.actors +package org.apache.toree.communication.actors import akka.actor.{Actor, ActorRef} import akka.util.ByteString -import com.ibm.spark.communication.{ZMQMessage, SocketManager} -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.{ZMQMessage, SocketManager} +import org.apache.toree.utils.LogLike import org.zeromq.ZMQ /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/actors/PubSocketActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/PubSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/PubSocketActor.scala index f74764e..e186926 100644 --- a/communication/src/main/scala/org/apache/toree/communication/actors/PubSocketActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/actors/PubSocketActor.scala @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.communication.actors +package org.apache.toree.communication.actors import akka.actor.Actor -import com.ibm.spark.communication.utils.OrderedSupport -import com.ibm.spark.communication.{SocketManager, ZMQMessage} -import com.ibm.spark.kernel.protocol.v5.KernelMessage -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.utils.OrderedSupport +import org.apache.toree.communication.{SocketManager, ZMQMessage} +import org.apache.toree.kernel.protocol.v5.KernelMessage +import org.apache.toree.utils.LogLike import org.zeromq.ZMQ /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/actors/RepSocketActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/RepSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/RepSocketActor.scala index b8643f5..9c54b30 100644 --- a/communication/src/main/scala/org/apache/toree/communication/actors/RepSocketActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/actors/RepSocketActor.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.communication.actors +package org.apache.toree.communication.actors import akka.actor.{Actor, ActorRef} import akka.util.ByteString -import com.ibm.spark.communication.{SocketManager, ZMQMessage} -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.{SocketManager, ZMQMessage} +import org.apache.toree.utils.LogLike import org.zeromq.ZMQ /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/actors/ReqSocketActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/ReqSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/ReqSocketActor.scala index e38f2a0..f1b65f4 100644 --- a/communication/src/main/scala/org/apache/toree/communication/actors/ReqSocketActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/actors/ReqSocketActor.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.communication.actors +package org.apache.toree.communication.actors import akka.actor.{Actor, ActorRef} import akka.util.ByteString -import com.ibm.spark.communication.{ZMQMessage, SocketManager} -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.{ZMQMessage, SocketManager} +import org.apache.toree.utils.LogLike import org.zeromq.ZMQ /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/actors/RouterSocketActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/RouterSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/RouterSocketActor.scala index 6aa3bc5..969aece 100644 --- a/communication/src/main/scala/org/apache/toree/communication/actors/RouterSocketActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/actors/RouterSocketActor.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.communication.actors +package org.apache.toree.communication.actors import akka.actor.{Actor, ActorRef} import akka.util.ByteString -import com.ibm.spark.communication.{SocketManager, ZMQMessage} -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.{SocketManager, ZMQMessage} +import org.apache.toree.utils.LogLike import org.zeromq.ZMQ /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/actors/SubSocketActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/actors/SubSocketActor.scala b/communication/src/main/scala/org/apache/toree/communication/actors/SubSocketActor.scala index 8fef496..e37ba4c 100644 --- a/communication/src/main/scala/org/apache/toree/communication/actors/SubSocketActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/actors/SubSocketActor.scala @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ibm.spark.communication.actors +package org.apache.toree.communication.actors import akka.actor.{Actor, ActorRef} import akka.util.ByteString -import com.ibm.spark.communication.{ZMQMessage, SocketManager} -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.{ZMQMessage, SocketManager} +import org.apache.toree.utils.LogLike /** * Represents an actor containing a subscribe socket. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/security/Hmac.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/security/Hmac.scala b/communication/src/main/scala/org/apache/toree/communication/security/Hmac.scala index 9f44177..1692f1e 100644 --- a/communication/src/main/scala/org/apache/toree/communication/security/Hmac.scala +++ b/communication/src/main/scala/org/apache/toree/communication/security/Hmac.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.communication.security +package org.apache.toree.communication.security import javax.crypto.Mac import javax.crypto.spec.SecretKeySpec -import com.ibm.spark.communication.security.HmacAlgorithm.HmacAlgorithm +import org.apache.toree.communication.security.HmacAlgorithm.HmacAlgorithm object HmacAlgorithm extends Enumeration { type HmacAlgorithm = Value http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/security/SignatureCheckerActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/security/SignatureCheckerActor.scala b/communication/src/main/scala/org/apache/toree/communication/security/SignatureCheckerActor.scala index c3fabd7..56ca1bd 100644 --- a/communication/src/main/scala/org/apache/toree/communication/security/SignatureCheckerActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/security/SignatureCheckerActor.scala @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.ibm.spark.communication.security +package org.apache.toree.communication.security import akka.actor.Actor -import com.ibm.spark.communication.utils.OrderedSupport -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.utils.OrderedSupport +import org.apache.toree.utils.LogLike /** * Verifies whether or not a kernel message has a valid signature. http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/security/SignatureManagerActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/security/SignatureManagerActor.scala b/communication/src/main/scala/org/apache/toree/communication/security/SignatureManagerActor.scala index f381644..bef8797 100644 --- a/communication/src/main/scala/org/apache/toree/communication/security/SignatureManagerActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/security/SignatureManagerActor.scala @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.ibm.spark.communication.security +package org.apache.toree.communication.security import akka.actor.{Props, ActorRef, Actor} import akka.util.Timeout -import com.ibm.spark.communication.utils.OrderedSupport -import com.ibm.spark.kernel.protocol.v5.KernelMessage -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.utils.OrderedSupport +import org.apache.toree.kernel.protocol.v5.KernelMessage +import org.apache.toree.utils.LogLike import scala.concurrent.duration._ import akka.pattern.ask http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/security/SignatureProducerActor.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/security/SignatureProducerActor.scala b/communication/src/main/scala/org/apache/toree/communication/security/SignatureProducerActor.scala index 36b5688..e0dc6d9 100644 --- a/communication/src/main/scala/org/apache/toree/communication/security/SignatureProducerActor.scala +++ b/communication/src/main/scala/org/apache/toree/communication/security/SignatureProducerActor.scala @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.ibm.spark.communication.security +package org.apache.toree.communication.security import akka.actor.Actor -import com.ibm.spark.communication.utils.OrderedSupport -import com.ibm.spark.kernel.protocol.v5.KernelMessage -import com.ibm.spark.utils.LogLike +import org.apache.toree.communication.utils.OrderedSupport +import org.apache.toree.kernel.protocol.v5.KernelMessage +import org.apache.toree.utils.LogLike import play.api.libs.json.Json /** http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/9612a625/communication/src/main/scala/org/apache/toree/communication/security/package.scala ---------------------------------------------------------------------- diff --git a/communication/src/main/scala/org/apache/toree/communication/security/package.scala b/communication/src/main/scala/org/apache/toree/communication/security/package.scala index 5c5b1d5..208b04b 100644 --- a/communication/src/main/scala/org/apache/toree/communication/security/package.scala +++ b/communication/src/main/scala/org/apache/toree/communication/security/package.scala @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.ibm.spark.communication +package org.apache.toree.communication package object security { object SecurityActorType extends Enumeration {
