Modified project structure to work with buildr

kiszk · Nov 14, 2010 · b84769a · b84769a
1 parent f8966ff
commit b84769a
Show file tree

Hide file tree

Showing 52 changed files with 47 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@ third_party/libmesos.dylib
 conf/java-opts
 conf/spark-env.sh
 conf/log4j.properties
+target
+reports
diff --git a/alltests b/alltests
@@ -8,4 +8,4 @@ if [ -d $RESULTS_DIR ]; then
   rm -r $RESULTS_DIR
 fi
 mkdir -p $RESULTS_DIR
-$FWDIR/run org.scalatest.tools.Runner -p $FWDIR/build/classes -u $RESULTS_DIR -o $@
+$FWDIR/run org.scalatest.tools.Runner -p $FWDIR/target/test/classes -u $RESULTS_DIR -o $@
diff --git a/buildfile b/buildfile
@@ -0,0 +1,22 @@
+require 'buildr/scala'
+
+# Version number for this release
+VERSION_NUMBER = "0.0.0"
+# Group identifier for your projects
+GROUP = "spark"
+COPYRIGHT = ""
+
+# Specify Maven 2.0 remote repositories here, like this:
+repositories.remote << "http://www.ibiblio.org/maven2/"
+
+THIRD_PARTY_JARS = Dir["third_party/**/*.jar"]
+
+desc "The Spark project"
+define "spark" do
+  project.version = VERSION_NUMBER
+  project.group = GROUP
+  manifest["Implementation-Vendor"] = COPYRIGHT
+  compile.with THIRD_PARTY_JARS
+  package(:jar)
+  test.using :scalatest, :fork => true
+end
diff --git a/run b/run
@@ -33,8 +33,8 @@ if [ -e $FWDIR/conf/java-opts ] ; then
 fi
 export JAVA_OPTS
 
-# Build up classpath
-CLASSPATH="$SPARK_CLASSPATH:$FWDIR/build/classes:$MESOS_CLASSPATH"
+# build up classpath
+CLASSPATH="$SPARK_CLASSPATH:$FWDIR/target/classes:$FWDIR/target/test/classes:$MESOS_CLASSPATH"
 CLASSPATH+=:$FWDIR/conf
 CLASSPATH+=:$FWDIR/third_party/mesos.jar
 CLASSPATH+=:$FWDIR/third_party/asm-3.2/lib/all/asm-all-3.2.jar

diff --git a/src/java/spark/compress/lzf/LZF.java → src/main/java/spark/compress/lzf/LZF.java b/src/java/spark/compress/lzf/LZF.java → src/main/java/spark/compress/lzf/LZF.java
diff --git a/...va/spark/compress/lzf/LZFInputStream.java → ...va/spark/compress/lzf/LZFInputStream.java b/...va/spark/compress/lzf/LZFInputStream.java → ...va/spark/compress/lzf/LZFInputStream.java
diff --git a/...a/spark/compress/lzf/LZFOutputStream.java → ...a/spark/compress/lzf/LZFOutputStream.java b/...a/spark/compress/lzf/LZFOutputStream.java → ...a/spark/compress/lzf/LZFOutputStream.java
diff --git a/src/native/Makefile → src/main/native/Makefile b/src/native/Makefile → src/main/native/Makefile
diff --git a/src/native/spark_compress_lzf_LZF.c → src/main/native/spark_compress_lzf_LZF.c b/src/native/spark_compress_lzf_LZF.c → src/main/native/spark_compress_lzf_LZF.c
diff --git a/src/scala/spark/Accumulators.scala → src/main/scala/spark/Accumulators.scala b/src/scala/spark/Accumulators.scala → src/main/scala/spark/Accumulators.scala
diff --git a/src/scala/spark/BoundedMemoryCache.scala → ...main/scala/spark/BoundedMemoryCache.scala b/src/scala/spark/BoundedMemoryCache.scala → ...main/scala/spark/BoundedMemoryCache.scala
diff --git a/src/scala/spark/Broadcast.scala → src/main/scala/spark/Broadcast.scala b/src/scala/spark/Broadcast.scala → src/main/scala/spark/Broadcast.scala
diff --git a/src/scala/spark/Cache.scala → src/main/scala/spark/Cache.scala b/src/scala/spark/Cache.scala → src/main/scala/spark/Cache.scala
diff --git a/src/scala/spark/ClosureCleaner.scala → src/main/scala/spark/ClosureCleaner.scala b/src/scala/spark/ClosureCleaner.scala → src/main/scala/spark/ClosureCleaner.scala
diff --git a/src/scala/spark/DfsShuffle.scala → src/main/scala/spark/DfsShuffle.scala b/src/scala/spark/DfsShuffle.scala → src/main/scala/spark/DfsShuffle.scala
diff --git a/src/scala/spark/Executor.scala → src/main/scala/spark/Executor.scala b/src/scala/spark/Executor.scala → src/main/scala/spark/Executor.scala
diff --git a/src/scala/spark/HadoopFile.scala → src/main/scala/spark/HadoopFile.scala b/src/scala/spark/HadoopFile.scala → src/main/scala/spark/HadoopFile.scala
diff --git a/src/scala/spark/HttpServer.scala → src/main/scala/spark/HttpServer.scala b/src/scala/spark/HttpServer.scala → src/main/scala/spark/HttpServer.scala
diff --git a/src/scala/spark/Job.scala → src/main/scala/spark/Job.scala b/src/scala/spark/Job.scala → src/main/scala/spark/Job.scala
diff --git a/src/scala/spark/LocalFileShuffle.scala → src/main/scala/spark/LocalFileShuffle.scala b/src/scala/spark/LocalFileShuffle.scala → src/main/scala/spark/LocalFileShuffle.scala
diff --git a/src/scala/spark/LocalScheduler.scala → src/main/scala/spark/LocalScheduler.scala b/src/scala/spark/LocalScheduler.scala → src/main/scala/spark/LocalScheduler.scala
diff --git a/src/scala/spark/Logging.scala → src/main/scala/spark/Logging.scala b/src/scala/spark/Logging.scala → src/main/scala/spark/Logging.scala
diff --git a/src/scala/spark/MesosScheduler.scala → src/main/scala/spark/MesosScheduler.scala b/src/scala/spark/MesosScheduler.scala → src/main/scala/spark/MesosScheduler.scala
diff --git a/src/scala/spark/NumberedSplitRDD.scala → src/main/scala/spark/NumberedSplitRDD.scala b/src/scala/spark/NumberedSplitRDD.scala → src/main/scala/spark/NumberedSplitRDD.scala
diff --git a/src/scala/spark/ParallelArray.scala → src/main/scala/spark/ParallelArray.scala b/src/scala/spark/ParallelArray.scala → src/main/scala/spark/ParallelArray.scala
diff --git a/src/scala/spark/RDD.scala → src/main/scala/spark/RDD.scala b/src/scala/spark/RDD.scala → src/main/scala/spark/RDD.scala
diff --git a/src/scala/spark/Scheduler.scala → src/main/scala/spark/Scheduler.scala b/src/scala/spark/Scheduler.scala → src/main/scala/spark/Scheduler.scala
diff --git a/src/scala/spark/SerializableWritable.scala → ...in/scala/spark/SerializableWritable.scala b/src/scala/spark/SerializableWritable.scala → ...in/scala/spark/SerializableWritable.scala
diff --git a/src/scala/spark/Shuffle.scala → src/main/scala/spark/Shuffle.scala b/src/scala/spark/Shuffle.scala → src/main/scala/spark/Shuffle.scala
diff --git a/src/scala/spark/SimpleJob.scala → src/main/scala/spark/SimpleJob.scala b/src/scala/spark/SimpleJob.scala → src/main/scala/spark/SimpleJob.scala
diff --git a/src/scala/spark/SizeEstimator.scala → src/main/scala/spark/SizeEstimator.scala b/src/scala/spark/SizeEstimator.scala → src/main/scala/spark/SizeEstimator.scala
diff --git a/src/scala/spark/SoftReferenceCache.scala → ...main/scala/spark/SoftReferenceCache.scala b/src/scala/spark/SoftReferenceCache.scala → ...main/scala/spark/SoftReferenceCache.scala
diff --git a/src/scala/spark/SparkContext.scala → src/main/scala/spark/SparkContext.scala b/src/scala/spark/SparkContext.scala → src/main/scala/spark/SparkContext.scala
diff --git a/src/scala/spark/SparkException.scala → src/main/scala/spark/SparkException.scala b/src/scala/spark/SparkException.scala → src/main/scala/spark/SparkException.scala
diff --git a/src/scala/spark/Split.scala → src/main/scala/spark/Split.scala b/src/scala/spark/Split.scala → src/main/scala/spark/Split.scala
diff --git a/src/scala/spark/Task.scala → src/main/scala/spark/Task.scala b/src/scala/spark/Task.scala → src/main/scala/spark/Task.scala
diff --git a/src/scala/spark/TaskResult.scala → src/main/scala/spark/TaskResult.scala b/src/scala/spark/TaskResult.scala → src/main/scala/spark/TaskResult.scala
diff --git a/src/scala/spark/Utils.scala → src/main/scala/spark/Utils.scala b/src/scala/spark/Utils.scala → src/main/scala/spark/Utils.scala
diff --git a/src/scala/spark/WeakReferenceCache.scala → ...main/scala/spark/WeakReferenceCache.scala b/src/scala/spark/WeakReferenceCache.scala → ...main/scala/spark/WeakReferenceCache.scala
diff --git a/...cala/spark/repl/ExecutorClassLoader.scala → ...cala/spark/repl/ExecutorClassLoader.scala b/...cala/spark/repl/ExecutorClassLoader.scala → ...cala/spark/repl/ExecutorClassLoader.scala
diff --git a/src/scala/spark/repl/Main.scala → src/main/scala/spark/repl/Main.scala b/src/scala/spark/repl/Main.scala → src/main/scala/spark/repl/Main.scala
diff --git a/src/scala/spark/repl/SparkCompletion.scala → ...in/scala/spark/repl/SparkCompletion.scala b/src/scala/spark/repl/SparkCompletion.scala → ...in/scala/spark/repl/SparkCompletion.scala
@@ -310,7 +310,7 @@ class SparkCompletion(val repl: SparkInterpreter) extends SparkCompletionOutput
       else xs.reduceLeft(_ zip _ takeWhile (x => x._1 == x._2) map (_._1) mkString)
 
     // This is jline's entry point for completion.
-    override def complete(_buf: String, cursor: Int, candidates: JList[String]): Int = {
+    override def complete(_buf: String, cursor: Int, candidates: JList[_]): Int = {
       val buf = onull(_buf)
       verbosity = if (isConsecutiveTabs(buf, cursor)) verbosity + 1 else 0
       DBG("complete(%s, %d) last = (%s, %d), verbosity: %s".format(buf, cursor, lastBuf, lastCursor, verbosity))
@@ -321,7 +321,7 @@ class SparkCompletion(val repl: SparkInterpreter) extends SparkCompletionOutput
           case Nil  => None
           case xs   =>
             // modify in place and return the position
-            xs foreach (candidates add _)
+            xs.foreach(x => candidates.asInstanceOf[JList[AnyRef]].add(x))
 
             // update the last buffer unless this is an alternatives list
             if (xs contains "") Some(p.cursor)

diff --git a/...la/spark/repl/SparkCompletionOutput.scala → ...la/spark/repl/SparkCompletionOutput.scala b/...la/spark/repl/SparkCompletionOutput.scala → ...la/spark/repl/SparkCompletionOutput.scala
diff --git a/...a/spark/repl/SparkInteractiveReader.scala → ...a/spark/repl/SparkInteractiveReader.scala b/...a/spark/repl/SparkInteractiveReader.scala → ...a/spark/repl/SparkInteractiveReader.scala
diff --git a/src/scala/spark/repl/SparkInterpreter.scala → ...n/scala/spark/repl/SparkInterpreter.scala b/src/scala/spark/repl/SparkInterpreter.scala → ...n/scala/spark/repl/SparkInterpreter.scala
diff --git a/...ala/spark/repl/SparkInterpreterLoop.scala → ...ala/spark/repl/SparkInterpreterLoop.scala b/...ala/spark/repl/SparkInterpreterLoop.scala → ...ala/spark/repl/SparkInterpreterLoop.scala
@@ -129,7 +129,8 @@ extends InterpreterControl {
       settings.classpath append addedClasspath
 
     interpreter = new SparkInterpreter(settings, out) {
-      override protected def parentClassLoader = classOf[SparkInterpreterLoop].getClassLoader
+      override protected def parentClassLoader = 
+        classOf[SparkInterpreterLoop].getClassLoader
     }
     interpreter.setContextClassLoader()
     // interpreter.quietBind("settings", "spark.repl.SparkInterpreterSettings", interpreter.isettings)

diff --git a/...spark/repl/SparkInterpreterSettings.scala → ...spark/repl/SparkInterpreterSettings.scala b/...spark/repl/SparkInterpreterSettings.scala → ...spark/repl/SparkInterpreterSettings.scala
diff --git a/src/scala/spark/repl/SparkJLineReader.scala → ...n/scala/spark/repl/SparkJLineReader.scala b/src/scala/spark/repl/SparkJLineReader.scala → ...n/scala/spark/repl/SparkJLineReader.scala
diff --git a/src/scala/spark/repl/SparkSimpleReader.scala → .../scala/spark/repl/SparkSimpleReader.scala b/src/scala/spark/repl/SparkSimpleReader.scala → .../scala/spark/repl/SparkSimpleReader.scala
diff --git a/src/test/spark/ParallelArraySplitSuite.scala → ...scala/spark/ParallelArraySplitSuite.scala b/src/test/spark/ParallelArraySplitSuite.scala → ...scala/spark/ParallelArraySplitSuite.scala
diff --git a/src/test/spark/ShuffleSuite.scala → src/test/scala/spark/ShuffleSuite.scala b/src/test/spark/ShuffleSuite.scala → src/test/scala/spark/ShuffleSuite.scala
diff --git a/src/test/spark/repl/ReplSuite.scala → src/test/scala/spark/repl/ReplSuite.scala b/src/test/spark/repl/ReplSuite.scala → src/test/scala/spark/repl/ReplSuite.scala
@@ -1,16 +1,31 @@
 package spark.repl
 
 import java.io._
+import java.net.URLClassLoader
+
+import scala.collection.mutable.ArrayBuffer
+import scala.collection.JavaConversions._
 
 import org.scalatest.FunSuite
 
 class ReplSuite extends FunSuite {
   def runInterpreter(master: String, input: String): String = {
     val in = new BufferedReader(new StringReader(input + "\n"))
     val out = new StringWriter()
+    val cl = getClass.getClassLoader
+    var paths = new ArrayBuffer[String]
+    if (cl.isInstanceOf[URLClassLoader]) {
+      val urlLoader = cl.asInstanceOf[URLClassLoader]
+      for (url <- urlLoader.getURLs) {
+        if (url.getProtocol == "file") {
+          paths += url.getFile
+        }
+      }
+    }
     val interp = new SparkInterpreterLoop(in, new PrintWriter(out), master)
     spark.repl.Main.interp = interp
-    interp.main(new Array[String](0))
+    val separator = System.getProperty("path.separator")
+    interp.main(Array("-classpath", paths.mkString(separator)))
     spark.repl.Main.interp = null
     return out.toString
   }