Merge pull request #195 from bpburns/plugin Allow attaching new Interpreters through config
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/45e451a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/45e451a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/45e451a5 Branch: refs/heads/master Commit: 45e451a5691bf7f4a30f69dbbba3e6651006b580 Parents: 9db161f ce10383 Author: Chip Senkbeil <chip.senkb...@gmail.com> Authored: Tue Nov 17 14:25:11 2015 -0600 Committer: Chip Senkbeil <chip.senkb...@gmail.com> Committed: Tue Nov 17 14:25:11 2015 -0600 ---------------------------------------------------------------------- .../com/ibm/spark/interpreter/Interpreter.scala | 13 ++ .../com/ibm/spark/kernel/api/KernelLike.scala | 6 + .../com/ibm/spark/boot/CommandLineOptions.scala | 23 +- .../boot/layer/ComponentInitialization.scala | 234 ++----------------- .../spark/boot/layer/InterpreterManager.scala | 66 ++++++ .../scala/com/ibm/spark/kernel/api/Kernel.scala | 50 ++-- .../ibm/spark/boot/CommandLineOptionsSpec.scala | 16 ++ .../StandardComponentInitializationSpec.scala | 114 --------- .../com/ibm/spark/kernel/api/KernelSpec.scala | 10 +- .../InterpreterActorSpecForIntegration.scala | 22 +- .../PostProcessorSpecForIntegration.scala | 21 +- .../scala/test/utils/DummyInterpreter.scala | 112 +++++++++ .../scala/test/utils/SparkKernelDeployer.scala | 44 +--- .../pyspark/PySparkInterpreter.scala | 22 +- .../com/ibm/spark/magic/builtin/PySpark.scala | 2 +- resources/compile/reference.conf | 11 +- resources/test/reference.conf | 11 +- .../interpreter/scala/ScalaInterpreter.scala | 120 ++++++++-- .../com/ibm/spark/magic/builtin/Scala.scala | 2 +- .../scala/ScalaInterpreterSpec.scala | 5 +- .../AddExternalJarMagicSpecForIntegration.scala | 21 +- .../interpreter/sparkr/SparkRInterpreter.scala | 12 +- .../com/ibm/spark/magic/builtin/SparkR.scala | 2 +- .../kernel/interpreter/sql/SqlInterpreter.scala | 15 +- .../scala/com/ibm/spark/magic/builtin/Sql.scala | 2 +- 25 files changed, 501 insertions(+), 455 deletions(-) ----------------------------------------------------------------------