incubator-toree git commit: [skip ci] Bump to 0.1.0.dev7

[lbustelo]

Repository: incubator-toree
Updated Branches:
  refs/heads/master 392aaef81 -> 8c12e4d7b


[skip ci] Bump to 0.1.0.dev7


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/8c12e4d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/8c12e4d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/8c12e4d7

Branch: refs/heads/master
Commit: 8c12e4d7b2f1ab06a583c45184d39f9e38564a82
Parents: 392aaef
Author: Gino Bustelo 
Authored: Fri Apr 29 15:12:19 2016 -0500
Committer: Gino Bustelo 
Committed: Fri Apr 29 15:12:19 2016 -0500

--
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/8c12e4d7/Makefile
--
diff --git a/Makefile b/Makefile
index feaf7d7..a95b44b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 
 .PHONY: help clean clean-dist build dev test test-travis release pip-release 
bin-release dev-binder .binder-image audit audit-licenses
 
-BASE_VERSION=0.1.0.dev6
+BASE_VERSION=0.1.0.dev7
 VERSION=$(BASE_VERSION)-incubating
 COMMIT=$(shell git rev-parse --short=12 --verify HEAD)
 ifeq (, $(findstring dev, $(VERSION)))

incubator-toree git commit: Remove the need to add assembly to driver-class-path

[cstubbs]

Repository: incubator-toree
Updated Branches:
  refs/heads/master cea63655a -> f81cec0ca


Remove the need to add assembly to driver-class-path


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/f81cec0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/f81cec0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/f81cec0c

Branch: refs/heads/master
Commit: f81cec0ca48d186b7e74ad9f6b6c3217a033cfe3
Parents: cea6365
Author: Gino Bustelo 
Authored: Thu Apr 28 15:51:39 2016 -0500
Committer: Gino Bustelo 
Committed: Thu Apr 28 15:52:56 2016 -0500

--
 etc/bin/run.sh|  1 -
 .../org/apache/toree/plugins/PluginSearcher.scala | 14 --
 2 files changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/f81cec0c/etc/bin/run.sh
--
diff --git a/etc/bin/run.sh b/etc/bin/run.sh
index b08cc0c..b6cf8cb 100755
--- a/etc/bin/run.sh
+++ b/etc/bin/run.sh
@@ -42,5 +42,4 @@ then
TOREE_OPTS=${__TOREE_OPTS__}
 fi
 
-SPARK_OPTS="--driver-class-path=\"${TOREE_ASSEMBLY}\" ${SPARK_OPTS}"
 eval exec "${SPARK_HOME}/bin/spark-submit" "${SPARK_OPTS}" --class 
org.apache.toree.Main "${TOREE_ASSEMBLY}" "${TOREE_OPTS}" "$@"

http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/f81cec0c/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala
--
diff --git 
a/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala 
b/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala
index 4686a50..01afe11 100644
--- a/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala
+++ b/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala
@@ -101,10 +101,12 @@ class PluginSearcher {
   .filter(c => classMatches(Seq(c)))
   }
 
-  private def classpath = System.getProperty("java.class.path")
-.split(File.pathSeparator)
-.map(s => if (s.trim.length == 0) "." else s)
-.map(new File(_))
-.filter(_.getAbsolutePath.toLowerCase.contains("toree"))
-.toList
+  private def classpath = {
+new 
File(this.getClass.getProtectionDomain.getCodeSource.getLocation.getPath) :: 
System.getProperty("java.class.path")
+ .split(File.pathSeparator)
+ .map(s => if (s.trim.length == 0) "." else s)
+ .map(new File(_))
+ .filter(_.getAbsolutePath.toLowerCase.contains("toree"))
+ .toList
+  }
 }