From fdae095de2daa1fc3b343c05e515235756d856a4 Mon Sep 17 00:00:00 2001
From: Sandeep <sandeep@techaddict.me>
Date: Tue, 6 May 2014 21:55:05 -0700
Subject: [PATCH] [HOTFIX] SPARK-1637: There are some Streaming examples added
after the PR #571 was last updated.
This resulted in Compilation Errors.
cc @mateiz project not compiling currently.
Author: Sandeep <sandeep@techaddict.me>
Closes #673 from techaddict/SPARK-1637-HOTFIX and squashes the following commits:
b512f4f [Sandeep] [SPARK-1637][HOTFIX] There are some Streaming examples added after the PR #571 was last updated. This resulted in Compilation Errors.
---
.../examples => examples/streaming}/JavaCustomReceiver.java | 6 ++----
.../examples => examples/streaming}/CustomReceiver.scala | 4 ++--
2 files changed, 4 insertions(+), 6 deletions(-)
rename examples/src/main/java/org/apache/spark/{streaming/examples => examples/streaming}/JavaCustomReceiver.java (98%)
rename examples/src/main/scala/org/apache/spark/{streaming/examples => examples/streaming}/CustomReceiver.scala (97%)
diff --git a/examples/src/main/java/org/apache/spark/streaming/examples/JavaCustomReceiver.java b/examples/src/main/java/org/apache/spark/examples/streaming/JavaCustomReceiver.java
similarity index 98%
rename from examples/src/main/java/org/apache/spark/streaming/examples/JavaCustomReceiver.java
rename to examples/src/main/java/org/apache/spark/examples/streaming/JavaCustomReceiver.java
index e36c7800be..7f558f3ee7 100644
--- a/examples/src/main/java/org/apache/spark/streaming/examples/JavaCustomReceiver.java
+++ b/examples/src/main/java/org/apache/spark/examples/streaming/JavaCustomReceiver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.streaming.examples;
+package org.apache.spark.examples.streaming;
import com.google.common.collect.Lists;
@@ -48,7 +48,7 @@ import java.util.regex.Pattern;
* To run this on your local machine, you need to first run a Netcat server
* `$ nc -lk 9999`
* and then run the example
- * `$ ./run org.apache.spark.streaming.examples.JavaCustomReceiver local[2] localhost 9999`
+ * `$ ./run org.apache.spark.examples.streaming.JavaCustomReceiver local[2] localhost 9999`
*/
public class JavaCustomReceiver extends Receiver<String> {
@@ -149,5 +149,3 @@ public class JavaCustomReceiver extends Receiver<String> {
}
}
}
-
-
diff --git a/examples/src/main/scala/org/apache/spark/streaming/examples/CustomReceiver.scala b/examples/src/main/scala/org/apache/spark/examples/streaming/CustomReceiver.scala
similarity index 97%
rename from examples/src/main/scala/org/apache/spark/streaming/examples/CustomReceiver.scala
rename to examples/src/main/scala/org/apache/spark/examples/streaming/CustomReceiver.scala
index eebffd8249..e317e2d36a 100644
--- a/examples/src/main/scala/org/apache/spark/streaming/examples/CustomReceiver.scala
+++ b/examples/src/main/scala/org/apache/spark/examples/streaming/CustomReceiver.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.spark.streaming.examples
+package org.apache.spark.examples.streaming
import java.io.{InputStreamReader, BufferedReader, InputStream}
import java.net.Socket
@@ -37,7 +37,7 @@ import org.apache.spark.streaming.receiver.Receiver
* To run this on your local machine, you need to first run a Netcat server
* `$ nc -lk 9999`
* and then run the example
- * `$ ./run org.apache.spark.streaming.examples.CustomReceiver local[2] localhost 9999`
+ * `$ ./run org.apache.spark.examples.streaming.CustomReceiver local[2] localhost 9999`
*/
object CustomReceiver {
def main(args: Array[String]) {
--
GitLab