aboutsummaryrefslogtreecommitdiff
path: root/streaming
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2012-07-29 13:35:22 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2012-07-29 13:35:22 -0700
commitfcee4153b92bdd66dd92820a2670b339f9f59c77 (patch)
treebca7aa8d5ca04706c72dcbb02824879c220fc187 /streaming
parente2e71a1fb57f3923ab6417f77d3dada26e49c527 (diff)
downloadspark-fcee4153b92bdd66dd92820a2670b339f9f59c77.tar.gz
spark-fcee4153b92bdd66dd92820a2670b339f9f59c77.tar.bz2
spark-fcee4153b92bdd66dd92820a2670b339f9f59c77.zip
Renamed stream package to streaming
Diffstat (limited to 'streaming')
-rw-r--r--streaming/src/main/scala/spark/streaming/BlockID.scala (renamed from streaming/src/main/scala/spark/stream/BlockID.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/ConnectionHandler.scala (renamed from streaming/src/main/scala/spark/stream/ConnectionHandler.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/DumbTopKWordCount2_Special.scala (renamed from streaming/src/main/scala/spark/stream/DumbTopKWordCount2_Special.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/DumbWordCount2_Special.scala (renamed from streaming/src/main/scala/spark/stream/DumbWordCount2_Special.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/FileStreamReceiver.scala (renamed from streaming/src/main/scala/spark/stream/FileStreamReceiver.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/GrepCount.scala (renamed from streaming/src/main/scala/spark/stream/GrepCount.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/GrepCount2.scala (renamed from streaming/src/main/scala/spark/stream/GrepCount2.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/GrepCountApprox.scala (renamed from streaming/src/main/scala/spark/stream/GrepCountApprox.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/IdealPerformance.scala (renamed from streaming/src/main/scala/spark/stream/IdealPerformance.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/Interval.scala (renamed from streaming/src/main/scala/spark/stream/Interval.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/Job.scala (renamed from streaming/src/main/scala/spark/stream/Job.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/JobManager.scala (renamed from streaming/src/main/scala/spark/stream/JobManager.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/JobManager2.scala (renamed from streaming/src/main/scala/spark/stream/JobManager2.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/NetworkStreamReceiver.scala (renamed from streaming/src/main/scala/spark/stream/NetworkStreamReceiver.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/RDS.scala (renamed from streaming/src/main/scala/spark/stream/RDS.scala)6
-rw-r--r--streaming/src/main/scala/spark/streaming/ReducedWindowedRDS.scala (renamed from streaming/src/main/scala/spark/stream/ReducedWindowedRDS.scala)4
-rw-r--r--streaming/src/main/scala/spark/streaming/Scheduler.scala (renamed from streaming/src/main/scala/spark/stream/Scheduler.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/SenGeneratorForPerformanceTest.scala (renamed from streaming/src/main/scala/spark/stream/SenGeneratorForPerformanceTest.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/SenderReceiverTest.scala (renamed from streaming/src/main/scala/spark/stream/SenderReceiverTest.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/SentenceFileGenerator.scala (renamed from streaming/src/main/scala/spark/stream/SentenceFileGenerator.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/SentenceGenerator.scala (renamed from streaming/src/main/scala/spark/stream/SentenceGenerator.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/ShuffleTest.scala (renamed from streaming/src/main/scala/spark/stream/ShuffleTest.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/SimpleWordCount.scala (renamed from streaming/src/main/scala/spark/stream/SimpleWordCount.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/SimpleWordCount2.scala (renamed from streaming/src/main/scala/spark/stream/SimpleWordCount2.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/SimpleWordCount2_Special.scala (renamed from streaming/src/main/scala/spark/stream/SimpleWordCount2_Special.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/SparkStreamContext.scala (renamed from streaming/src/main/scala/spark/stream/SparkStreamContext.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TestGenerator.scala (renamed from streaming/src/main/scala/spark/stream/TestGenerator.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TestGenerator2.scala (renamed from streaming/src/main/scala/spark/stream/TestGenerator2.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TestGenerator4.scala (renamed from streaming/src/main/scala/spark/stream/TestGenerator4.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TestInputBlockTracker.scala (renamed from streaming/src/main/scala/spark/stream/TestInputBlockTracker.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TestStreamCoordinator.scala (renamed from streaming/src/main/scala/spark/stream/TestStreamCoordinator.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TestStreamReceiver3.scala (renamed from streaming/src/main/scala/spark/stream/TestStreamReceiver3.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TestStreamReceiver4.scala (renamed from streaming/src/main/scala/spark/stream/TestStreamReceiver4.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/Time.scala (renamed from streaming/src/main/scala/spark/stream/Time.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TopContentCount.scala (renamed from streaming/src/main/scala/spark/stream/TopContentCount.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TopKWordCount2.scala (renamed from streaming/src/main/scala/spark/stream/TopKWordCount2.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/TopKWordCount2_Special.scala (renamed from streaming/src/main/scala/spark/stream/TopKWordCount2_Special.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/WindowedRDS.scala (renamed from streaming/src/main/scala/spark/stream/WindowedRDS.scala)4
-rw-r--r--streaming/src/main/scala/spark/streaming/WordCount.scala (renamed from streaming/src/main/scala/spark/stream/WordCount.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/WordCount1.scala (renamed from streaming/src/main/scala/spark/stream/WordCount1.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/WordCount2.scala (renamed from streaming/src/main/scala/spark/stream/WordCount2.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/WordCount2_Special.scala (renamed from streaming/src/main/scala/spark/stream/WordCount2_Special.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/WordCount3.scala (renamed from streaming/src/main/scala/spark/stream/WordCount3.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/WordCountEc2.scala (renamed from streaming/src/main/scala/spark/stream/WordCountEc2.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/WordCountTrivialWindow.scala (renamed from streaming/src/main/scala/spark/stream/WordCountTrivialWindow.scala)2
-rw-r--r--streaming/src/main/scala/spark/streaming/WordMax.scala (renamed from streaming/src/main/scala/spark/stream/WordMax.scala)2
46 files changed, 50 insertions, 50 deletions
diff --git a/streaming/src/main/scala/spark/stream/BlockID.scala b/streaming/src/main/scala/spark/streaming/BlockID.scala
index a3fd046c9a..16aacfda18 100644
--- a/streaming/src/main/scala/spark/stream/BlockID.scala
+++ b/streaming/src/main/scala/spark/streaming/BlockID.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
case class BlockID(sRds: String, sInterval: Interval, sPartition: Int) {
override def toString : String = (
diff --git a/streaming/src/main/scala/spark/stream/ConnectionHandler.scala b/streaming/src/main/scala/spark/streaming/ConnectionHandler.scala
index 73b82b76b8..a4f454632f 100644
--- a/streaming/src/main/scala/spark/stream/ConnectionHandler.scala
+++ b/streaming/src/main/scala/spark/streaming/ConnectionHandler.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.Logging
diff --git a/streaming/src/main/scala/spark/stream/DumbTopKWordCount2_Special.scala b/streaming/src/main/scala/spark/streaming/DumbTopKWordCount2_Special.scala
index bd43f44b1a..2ca72da79f 100644
--- a/streaming/src/main/scala/spark/stream/DumbTopKWordCount2_Special.scala
+++ b/streaming/src/main/scala/spark/streaming/DumbTopKWordCount2_Special.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/DumbWordCount2_Special.scala b/streaming/src/main/scala/spark/streaming/DumbWordCount2_Special.scala
index 31d682348a..34e7edfda9 100644
--- a/streaming/src/main/scala/spark/stream/DumbWordCount2_Special.scala
+++ b/streaming/src/main/scala/spark/streaming/DumbWordCount2_Special.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/FileStreamReceiver.scala b/streaming/src/main/scala/spark/streaming/FileStreamReceiver.scala
index 026254d6e1..92c7cfe00c 100644
--- a/streaming/src/main/scala/spark/stream/FileStreamReceiver.scala
+++ b/streaming/src/main/scala/spark/streaming/FileStreamReceiver.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.Logging
diff --git a/streaming/src/main/scala/spark/stream/GrepCount.scala b/streaming/src/main/scala/spark/streaming/GrepCount.scala
index 45b90d4837..ec3e70f258 100644
--- a/streaming/src/main/scala/spark/stream/GrepCount.scala
+++ b/streaming/src/main/scala/spark/streaming/GrepCount.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/GrepCount2.scala b/streaming/src/main/scala/spark/streaming/GrepCount2.scala
index 4eb65ba906..27ecced1c0 100644
--- a/streaming/src/main/scala/spark/stream/GrepCount2.scala
+++ b/streaming/src/main/scala/spark/streaming/GrepCount2.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/GrepCountApprox.scala b/streaming/src/main/scala/spark/streaming/GrepCountApprox.scala
index a4be2cc936..f9674136fe 100644
--- a/streaming/src/main/scala/spark/stream/GrepCountApprox.scala
+++ b/streaming/src/main/scala/spark/streaming/GrepCountApprox.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/IdealPerformance.scala b/streaming/src/main/scala/spark/streaming/IdealPerformance.scala
index 589fb2def0..303d4e7ae6 100644
--- a/streaming/src/main/scala/spark/stream/IdealPerformance.scala
+++ b/streaming/src/main/scala/spark/streaming/IdealPerformance.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import scala.collection.mutable.Map
diff --git a/streaming/src/main/scala/spark/stream/Interval.scala b/streaming/src/main/scala/spark/streaming/Interval.scala
index 08d0ed95b4..a985f44ba1 100644
--- a/streaming/src/main/scala/spark/stream/Interval.scala
+++ b/streaming/src/main/scala/spark/streaming/Interval.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
case class Interval (val beginTime: Time, val endTime: Time) {
diff --git a/streaming/src/main/scala/spark/stream/Job.scala b/streaming/src/main/scala/spark/streaming/Job.scala
index bfdd5db645..f7654dff79 100644
--- a/streaming/src/main/scala/spark/stream/Job.scala
+++ b/streaming/src/main/scala/spark/streaming/Job.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
class Job(val time: Time, func: () => _) {
val id = Job.getNewId()
diff --git a/streaming/src/main/scala/spark/stream/JobManager.scala b/streaming/src/main/scala/spark/streaming/JobManager.scala
index 5ea80b92aa..45a3971643 100644
--- a/streaming/src/main/scala/spark/stream/JobManager.scala
+++ b/streaming/src/main/scala/spark/streaming/JobManager.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkEnv
import spark.Logging
diff --git a/streaming/src/main/scala/spark/stream/JobManager2.scala b/streaming/src/main/scala/spark/streaming/JobManager2.scala
index b69653b9a4..ce0154e19b 100644
--- a/streaming/src/main/scala/spark/stream/JobManager2.scala
+++ b/streaming/src/main/scala/spark/streaming/JobManager2.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.{Logging, SparkEnv}
import java.util.concurrent.Executors
diff --git a/streaming/src/main/scala/spark/stream/NetworkStreamReceiver.scala b/streaming/src/main/scala/spark/streaming/NetworkStreamReceiver.scala
index 8be46cc927..efd4689cf0 100644
--- a/streaming/src/main/scala/spark/stream/NetworkStreamReceiver.scala
+++ b/streaming/src/main/scala/spark/streaming/NetworkStreamReceiver.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.Logging
import spark.storage.StorageLevel
diff --git a/streaming/src/main/scala/spark/stream/RDS.scala b/streaming/src/main/scala/spark/streaming/RDS.scala
index b83181b0d1..c8dd1015ed 100644
--- a/streaming/src/main/scala/spark/stream/RDS.scala
+++ b/streaming/src/main/scala/spark/streaming/RDS.scala
@@ -1,6 +1,6 @@
-package spark.stream
+package spark.streaming
-import spark.stream.SparkStreamContext._
+import spark.streaming.SparkStreamContext._
import spark.RDD
import spark.BlockRDD
@@ -41,7 +41,7 @@ extends Logging with Serializable {
@transient private val generatedRDDs = new HashMap[Time, RDD[T]] ()
// Variable to be set to the first time seen by the RDS (effective time zero)
- private[stream] var zeroTime: Time = null
+ private[streaming] var zeroTime: Time = null
// Variable to specify storage level
private var storageLevel: StorageLevel = StorageLevel.NONE
diff --git a/streaming/src/main/scala/spark/stream/ReducedWindowedRDS.scala b/streaming/src/main/scala/spark/streaming/ReducedWindowedRDS.scala
index d47654ccb9..dd1f474657 100644
--- a/streaming/src/main/scala/spark/stream/ReducedWindowedRDS.scala
+++ b/streaming/src/main/scala/spark/streaming/ReducedWindowedRDS.scala
@@ -1,6 +1,6 @@
-package spark.stream
+package spark.streaming
-import spark.stream.SparkStreamContext._
+import spark.streaming.SparkStreamContext._
import spark.RDD
import spark.UnionRDD
diff --git a/streaming/src/main/scala/spark/stream/Scheduler.scala b/streaming/src/main/scala/spark/streaming/Scheduler.scala
index 38946fef11..4137d8f27d 100644
--- a/streaming/src/main/scala/spark/stream/Scheduler.scala
+++ b/streaming/src/main/scala/spark/streaming/Scheduler.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkEnv
import spark.Logging
diff --git a/streaming/src/main/scala/spark/stream/SenGeneratorForPerformanceTest.scala b/streaming/src/main/scala/spark/streaming/SenGeneratorForPerformanceTest.scala
index 74fd54072f..bb32089ae2 100644
--- a/streaming/src/main/scala/spark/stream/SenGeneratorForPerformanceTest.scala
+++ b/streaming/src/main/scala/spark/streaming/SenGeneratorForPerformanceTest.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import scala.util.Random
import scala.io.Source
diff --git a/streaming/src/main/scala/spark/stream/SenderReceiverTest.scala b/streaming/src/main/scala/spark/streaming/SenderReceiverTest.scala
index 69879b621c..6af270298a 100644
--- a/streaming/src/main/scala/spark/stream/SenderReceiverTest.scala
+++ b/streaming/src/main/scala/spark/streaming/SenderReceiverTest.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import java.net.{Socket, ServerSocket}
import java.io.{ByteArrayOutputStream, DataOutputStream, DataInputStream, BufferedInputStream}
diff --git a/streaming/src/main/scala/spark/stream/SentenceFileGenerator.scala b/streaming/src/main/scala/spark/streaming/SentenceFileGenerator.scala
index 9aa441d9bb..15858f59e3 100644
--- a/streaming/src/main/scala/spark/stream/SentenceFileGenerator.scala
+++ b/streaming/src/main/scala/spark/streaming/SentenceFileGenerator.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark._
diff --git a/streaming/src/main/scala/spark/stream/SentenceGenerator.scala b/streaming/src/main/scala/spark/streaming/SentenceGenerator.scala
index ef66e66047..a9f124d2d7 100644
--- a/streaming/src/main/scala/spark/stream/SentenceGenerator.scala
+++ b/streaming/src/main/scala/spark/streaming/SentenceGenerator.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import scala.util.Random
import scala.io.Source
diff --git a/streaming/src/main/scala/spark/stream/ShuffleTest.scala b/streaming/src/main/scala/spark/streaming/ShuffleTest.scala
index 5ad56f6777..32aa4144a0 100644
--- a/streaming/src/main/scala/spark/stream/ShuffleTest.scala
+++ b/streaming/src/main/scala/spark/streaming/ShuffleTest.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/SimpleWordCount.scala b/streaming/src/main/scala/spark/streaming/SimpleWordCount.scala
index c53fe35f44..a75ccd3a56 100644
--- a/streaming/src/main/scala/spark/stream/SimpleWordCount.scala
+++ b/streaming/src/main/scala/spark/streaming/SimpleWordCount.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/SimpleWordCount2.scala b/streaming/src/main/scala/spark/streaming/SimpleWordCount2.scala
index 1a2c67cd4d..9672e64b13 100644
--- a/streaming/src/main/scala/spark/stream/SimpleWordCount2.scala
+++ b/streaming/src/main/scala/spark/streaming/SimpleWordCount2.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/SimpleWordCount2_Special.scala b/streaming/src/main/scala/spark/streaming/SimpleWordCount2_Special.scala
index 9003a5dbb3..503033a8e5 100644
--- a/streaming/src/main/scala/spark/stream/SimpleWordCount2_Special.scala
+++ b/streaming/src/main/scala/spark/streaming/SimpleWordCount2_Special.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/SparkStreamContext.scala b/streaming/src/main/scala/spark/streaming/SparkStreamContext.scala
index 0e65196e46..51f8193740 100644
--- a/streaming/src/main/scala/spark/stream/SparkStreamContext.scala
+++ b/streaming/src/main/scala/spark/streaming/SparkStreamContext.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import spark.SparkEnv
diff --git a/streaming/src/main/scala/spark/stream/TestGenerator.scala b/streaming/src/main/scala/spark/streaming/TestGenerator.scala
index 738ce17452..0ff6af61f2 100644
--- a/streaming/src/main/scala/spark/stream/TestGenerator.scala
+++ b/streaming/src/main/scala/spark/streaming/TestGenerator.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import scala.util.Random
import scala.io.Source
diff --git a/streaming/src/main/scala/spark/stream/TestGenerator2.scala b/streaming/src/main/scala/spark/streaming/TestGenerator2.scala
index ceb4730e72..00d43604d0 100644
--- a/streaming/src/main/scala/spark/stream/TestGenerator2.scala
+++ b/streaming/src/main/scala/spark/streaming/TestGenerator2.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import scala.util.Random
import scala.io.Source
diff --git a/streaming/src/main/scala/spark/stream/TestGenerator4.scala b/streaming/src/main/scala/spark/streaming/TestGenerator4.scala
index edeb969d7c..93c7f2f440 100644
--- a/streaming/src/main/scala/spark/stream/TestGenerator4.scala
+++ b/streaming/src/main/scala/spark/streaming/TestGenerator4.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.Logging
diff --git a/streaming/src/main/scala/spark/stream/TestInputBlockTracker.scala b/streaming/src/main/scala/spark/streaming/TestInputBlockTracker.scala
index da3b964407..7e23b7bb82 100644
--- a/streaming/src/main/scala/spark/stream/TestInputBlockTracker.scala
+++ b/streaming/src/main/scala/spark/streaming/TestInputBlockTracker.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.Logging
import scala.collection.mutable.{ArrayBuffer, HashMap}
diff --git a/streaming/src/main/scala/spark/stream/TestStreamCoordinator.scala b/streaming/src/main/scala/spark/streaming/TestStreamCoordinator.scala
index add166fbd9..c658a036f9 100644
--- a/streaming/src/main/scala/spark/stream/TestStreamCoordinator.scala
+++ b/streaming/src/main/scala/spark/streaming/TestStreamCoordinator.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.Logging
diff --git a/streaming/src/main/scala/spark/stream/TestStreamReceiver3.scala b/streaming/src/main/scala/spark/streaming/TestStreamReceiver3.scala
index 9cc342040b..a7a5635aa5 100644
--- a/streaming/src/main/scala/spark/stream/TestStreamReceiver3.scala
+++ b/streaming/src/main/scala/spark/streaming/TestStreamReceiver3.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark._
import spark.storage._
diff --git a/streaming/src/main/scala/spark/stream/TestStreamReceiver4.scala b/streaming/src/main/scala/spark/streaming/TestStreamReceiver4.scala
index e7bef75391..2c3f5d1b9d 100644
--- a/streaming/src/main/scala/spark/stream/TestStreamReceiver4.scala
+++ b/streaming/src/main/scala/spark/streaming/TestStreamReceiver4.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark._
import spark.storage._
diff --git a/streaming/src/main/scala/spark/stream/Time.scala b/streaming/src/main/scala/spark/streaming/Time.scala
index 25369dfee5..b932fe9258 100644
--- a/streaming/src/main/scala/spark/stream/Time.scala
+++ b/streaming/src/main/scala/spark/streaming/Time.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
abstract case class Time {
diff --git a/streaming/src/main/scala/spark/stream/TopContentCount.scala b/streaming/src/main/scala/spark/streaming/TopContentCount.scala
index a8cca4e793..031e989c87 100644
--- a/streaming/src/main/scala/spark/stream/TopContentCount.scala
+++ b/streaming/src/main/scala/spark/streaming/TopContentCount.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/TopKWordCount2.scala b/streaming/src/main/scala/spark/streaming/TopKWordCount2.scala
index 7dd06dd5ee..679ed0a7ef 100644
--- a/streaming/src/main/scala/spark/stream/TopKWordCount2.scala
+++ b/streaming/src/main/scala/spark/streaming/TopKWordCount2.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/TopKWordCount2_Special.scala b/streaming/src/main/scala/spark/streaming/TopKWordCount2_Special.scala
index e9f3f914ae..c873fbd0f0 100644
--- a/streaming/src/main/scala/spark/stream/TopKWordCount2_Special.scala
+++ b/streaming/src/main/scala/spark/streaming/TopKWordCount2_Special.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/WindowedRDS.scala b/streaming/src/main/scala/spark/streaming/WindowedRDS.scala
index a2e7966edb..812a982301 100644
--- a/streaming/src/main/scala/spark/stream/WindowedRDS.scala
+++ b/streaming/src/main/scala/spark/streaming/WindowedRDS.scala
@@ -1,6 +1,6 @@
-package spark.stream
+package spark.streaming
-import spark.stream.SparkStreamContext._
+import spark.streaming.SparkStreamContext._
import spark.RDD
import spark.UnionRDD
diff --git a/streaming/src/main/scala/spark/stream/WordCount.scala b/streaming/src/main/scala/spark/streaming/WordCount.scala
index af825e46a8..fb5508ffcc 100644
--- a/streaming/src/main/scala/spark/stream/WordCount.scala
+++ b/streaming/src/main/scala/spark/streaming/WordCount.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/WordCount1.scala b/streaming/src/main/scala/spark/streaming/WordCount1.scala
index 501062b18d..42d985920a 100644
--- a/streaming/src/main/scala/spark/stream/WordCount1.scala
+++ b/streaming/src/main/scala/spark/streaming/WordCount1.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/WordCount2.scala b/streaming/src/main/scala/spark/streaming/WordCount2.scala
index 24324e891a..9168a2fe2f 100644
--- a/streaming/src/main/scala/spark/stream/WordCount2.scala
+++ b/streaming/src/main/scala/spark/streaming/WordCount2.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/WordCount2_Special.scala b/streaming/src/main/scala/spark/streaming/WordCount2_Special.scala
index c6b1aaa57e..1920915af7 100644
--- a/streaming/src/main/scala/spark/stream/WordCount2_Special.scala
+++ b/streaming/src/main/scala/spark/streaming/WordCount2_Special.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import spark.SparkContext
import SparkContext._
diff --git a/streaming/src/main/scala/spark/stream/WordCount3.scala b/streaming/src/main/scala/spark/streaming/WordCount3.scala
index 455a8c9dbf..018c19a509 100644
--- a/streaming/src/main/scala/spark/stream/WordCount3.scala
+++ b/streaming/src/main/scala/spark/streaming/WordCount3.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/WordCountEc2.scala b/streaming/src/main/scala/spark/streaming/WordCountEc2.scala
index 5b10026d7a..82b9fa781d 100644
--- a/streaming/src/main/scala/spark/stream/WordCountEc2.scala
+++ b/streaming/src/main/scala/spark/streaming/WordCountEc2.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
import spark.SparkContext
diff --git a/streaming/src/main/scala/spark/stream/WordCountTrivialWindow.scala b/streaming/src/main/scala/spark/streaming/WordCountTrivialWindow.scala
index 5469df71e9..114dd144f1 100644
--- a/streaming/src/main/scala/spark/stream/WordCountTrivialWindow.scala
+++ b/streaming/src/main/scala/spark/streaming/WordCountTrivialWindow.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._
diff --git a/streaming/src/main/scala/spark/stream/WordMax.scala b/streaming/src/main/scala/spark/streaming/WordMax.scala
index fc075e6d9d..fbfc48030f 100644
--- a/streaming/src/main/scala/spark/stream/WordMax.scala
+++ b/streaming/src/main/scala/spark/streaming/WordMax.scala
@@ -1,4 +1,4 @@
-package spark.stream
+package spark.streaming
import SparkStreamContext._