Merge pull request #334 from pwendell/examples-fix Removing SPARK_EXAMPLES_JAR in the code
This re-writes all of the examples to use the `SparkContext.jarOfClass` mechanism for loading the examples jar. This necessary for environments like YARN and the Standalone mode where example programs will be submit from inside the cluster rather than at the client using `./spark-example`. This still leaves SPARK_EXAMPLES_JAR in place in the shell scripts for setting up the classpath if `./spark-example` is run. Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/5b0986a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/5b0986a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/5b0986a1 Branch: refs/heads/master Commit: 5b0986a1d675f0f9d7d14b3d48fdadcb4f7055b7 Parents: f4b924f 79f5280 Author: Reynold Xin <r...@apache.org> Authored: Sun Jan 5 19:25:09 2014 -0800 Committer: Reynold Xin <r...@apache.org> Committed: Sun Jan 5 19:25:09 2014 -0800 ---------------------------------------------------------------------- .../spark/api/java/JavaSparkContext.scala | 6 +++++ .../org/apache/spark/examples/JavaHdfsLR.java | 2 +- .../org/apache/spark/examples/JavaKMeans.java | 2 +- .../org/apache/spark/examples/JavaLogQuery.java | 2 +- .../org/apache/spark/examples/JavaPageRank.java | 3 ++- .../org/apache/spark/examples/JavaSparkPi.java | 2 +- .../java/org/apache/spark/examples/JavaTC.java | 2 +- .../apache/spark/examples/JavaWordCount.java | 2 +- .../apache/spark/mllib/examples/JavaALS.java | 2 +- .../apache/spark/mllib/examples/JavaKMeans.java | 2 +- .../org/apache/spark/mllib/examples/JavaLR.java | 2 +- .../streaming/examples/JavaFlumeEventCount.java | 3 ++- .../streaming/examples/JavaKafkaWordCount.java | 3 ++- .../examples/JavaNetworkWordCount.java | 3 ++- .../streaming/examples/JavaQueueStream.java | 2 +- .../apache/spark/examples/BroadcastTest.scala | 2 +- .../spark/examples/ExceptionHandlingTest.scala | 2 +- .../org/apache/spark/examples/GroupByTest.scala | 2 +- .../org/apache/spark/examples/HBaseTest.scala | 2 +- .../org/apache/spark/examples/HdfsTest.scala | 2 +- .../org/apache/spark/examples/LogQuery.scala | 2 +- .../spark/examples/MultiBroadcastTest.scala | 2 +- .../examples/SimpleSkewedGroupByTest.scala | 2 +- .../spark/examples/SkewedGroupByTest.scala | 2 +- .../org/apache/spark/examples/SparkALS.scala | 2 +- .../org/apache/spark/examples/SparkHdfsLR.scala | 2 +- .../org/apache/spark/examples/SparkKMeans.scala | 2 +- .../org/apache/spark/examples/SparkLR.scala | 2 +- .../apache/spark/examples/SparkPageRank.scala | 2 +- .../org/apache/spark/examples/SparkPi.scala | 2 +- .../org/apache/spark/examples/SparkTC.scala | 2 +- .../streaming/examples/ActorWordCount.scala | 2 +- .../streaming/examples/FlumeEventCount.scala | 2 +- .../streaming/examples/HdfsWordCount.scala | 2 +- .../streaming/examples/KafkaWordCount.scala | 2 +- .../streaming/examples/MQTTWordCount.scala | 2 +- .../streaming/examples/NetworkWordCount.scala | 2 +- .../spark/streaming/examples/QueueStream.scala | 2 +- .../streaming/examples/RawNetworkGrep.scala | 2 +- .../examples/StatefulNetworkWordCount.scala | 2 +- .../streaming/examples/TwitterAlgebirdCMS.scala | 2 +- .../streaming/examples/TwitterAlgebirdHLL.scala | 2 +- .../streaming/examples/TwitterPopularTags.scala | 2 +- .../streaming/examples/ZeroMQWordCount.scala | 2 +- .../examples/clickstream/PageViewStream.scala | 2 +- .../spark/streaming/StreamingContext.scala | 6 +++++ .../api/java/JavaStreamingContext.scala | 25 ++++++++++++-------- 47 files changed, 75 insertions(+), 54 deletions(-) ----------------------------------------------------------------------