You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2013/12/24 22:39:21 UTC
[1/2] git commit: Change the order of CLASSPATH.
Updated Branches:
refs/heads/master d63856c36 -> 3bf7c708d
Change the order of CLASSPATH.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/d5b260e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/d5b260e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/d5b260e7
Branch: refs/heads/master
Commit: d5b260e7dd17c43e45f5c16c663d3479fb8757d1
Parents: f4effb3
Author: Takuya UESHIN <ue...@happy-camper.st>
Authored: Thu Dec 19 02:16:04 2013 +0900
Committer: Takuya UESHIN <ue...@happy-camper.st>
Committed: Thu Dec 19 02:17:08 2013 +0900
----------------------------------------------------------------------
spark-class | 2 +-
spark-class2.cmd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/d5b260e7/spark-class
----------------------------------------------------------------------
diff --git a/spark-class b/spark-class
index 4fa6fb8..ff51fbd 100755
--- a/spark-class
+++ b/spark-class
@@ -124,7 +124,7 @@ fi
# Compute classpath using external script
CLASSPATH=`$FWDIR/bin/compute-classpath.sh`
-CLASSPATH="$SPARK_TOOLS_JAR:$CLASSPATH"
+CLASSPATH="$CLASSPATH:$SPARK_TOOLS_JAR"
export CLASSPATH
if [ "$SPARK_PRINT_LAUNCH_COMMAND" == "1" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/d5b260e7/spark-class2.cmd
----------------------------------------------------------------------
diff --git a/spark-class2.cmd b/spark-class2.cmd
index 3869d07..a60c17d 100644
--- a/spark-class2.cmd
+++ b/spark-class2.cmd
@@ -75,7 +75,7 @@ rem Compute classpath using external script
set DONT_PRINT_CLASSPATH=1
call "%FWDIR%bin\compute-classpath.cmd"
set DONT_PRINT_CLASSPATH=0
-set CLASSPATH=%SPARK_TOOLS_JAR%;%CLASSPATH%
+set CLASSPATH=%CLASSPATH%;%SPARK_TOOLS_JAR%
rem Figure out where java is.
set RUNNER=java
[2/2] git commit: Merge pull request #275 from
ueshin/wip/changeclasspathorder
Posted by ma...@apache.org.
Merge pull request #275 from ueshin/wip/changeclasspathorder
Change the order of CLASSPATH.
SPARK_TOOLS_JAR should be placed after CLASSPATH or at least after
SPARK_CLASSPATH.
If SPARK_TOOLS_JAR is placed before CLASSPATH, all assembled classes and
resources in spark-tools-assembly.jar beat those in CLASSPATH or
SPARK_CLASSPATH, which might be replaced by customized versions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/3bf7c708
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/3bf7c708
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/3bf7c708
Branch: refs/heads/master
Commit: 3bf7c708d3206b2144aa464b03cef36f6046e0be
Parents: d63856c d5b260e
Author: Matei Zaharia <ma...@databricks.com>
Authored: Tue Dec 24 16:37:13 2013 -0500
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Tue Dec 24 16:37:13 2013 -0500
----------------------------------------------------------------------
spark-class | 6 +++---
spark-class2.cmd | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/3bf7c708/spark-class
----------------------------------------------------------------------
diff --cc spark-class
index 4eb95a9,ff51fbd..802e4aa
--- a/spark-class
+++ b/spark-class
@@@ -129,12 -124,7 +129,12 @@@ f
# Compute classpath using external script
CLASSPATH=`$FWDIR/bin/compute-classpath.sh`
- CLASSPATH="$SPARK_TOOLS_JAR:$CLASSPATH"
+ CLASSPATH="$CLASSPATH:$SPARK_TOOLS_JAR"
+
+if $cygwin; then
- CLASSPATH=`cygpath -wp $CLASSPATH`
- export SPARK_TOOLS_JAR=`cygpath -w $SPARK_TOOLS_JAR`
++ CLASSPATH=`cygpath -wp $CLASSPATH`
++ export SPARK_TOOLS_JAR=`cygpath -w $SPARK_TOOLS_JAR`
+fi
export CLASSPATH
if [ "$SPARK_PRINT_LAUNCH_COMMAND" == "1" ]; then