housekeeping

Author: jey

Makefile

@@ -1,8 +1,16 @@
-CLASSPATH := lib/spark.jar:lib/commons-io-2.4.jar:lib/scala-library-2.10.4.jar
+BASE_CLASSPATH := lib/spark.jar
+BUILD_CLASSPATH := $(BASE_CLASSPATH)
+#BUILD_CLASSPATH := $(BUILD_CLASSPATH):lib/scala-library-2.10.4.jar
+RUNTIME_CLASSPATH := conf:$(BASE_CLASSPATH):spock.jar
 
 check: spock.jar
-	CLASSPATH=$(CLASSPATH) julia test/runtests.jl
+	CLASSPATH=$(RUNTIME_CLASSPATH) julia test/runtests.jl
 
 spock.jar: $(shell find src/ -name \*.java)
-	javac -cp $(CLASSPATH) $^
-	cd src && find . -name \*.class -print0 | xargs -0 jar cf ../$@
+	mkdir -p bin
+	javac -Xlint -d bin -cp $(BUILD_CLASSPATH) $^
+	jar cf spock.jar -C bin .
+
+.PHONY: clean
+clean:
+	rm -rf bin spock.jar

conf/log4j.properties

@@ -0,0 +1,12 @@
+# Set everything to be logged to the console
+log4j.rootCategory=WARN, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
+
+# Settings to quiet third party logs that are too verbose
+log4j.logger.org.eclipse.jetty=WARN
+log4j.logger.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR
+log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
+log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO

src/Spock.jl

@@ -7,7 +7,7 @@ module Spock
   export SparkContext, RDD, parallelize
 
   const classpath = get(ENV, "CLASSPATH", "")
-  JavaCall.init(["-ea", "-Xmx1024M", "-Djava.class.path=spock.jar:$(classpath)"])
+  JavaCall.init(["-ea", "-Xmx1024M", "-Djava.class.path=$(classpath)"])
 
   JClass = @jimport java.lang.Class
   JArrays = @jimport java.util.Arrays
@@ -26,7 +26,7 @@ module Spock
     jsc::JJavaSparkContext
   end
 
-  function SparkContext(master::String="local", appname::String="Julia Spock App @ $(spockid())")
+  function SparkContext(master::String="local", appname::String="Julia Spock app @ $(spockid())")
     SparkContext(JJavaSparkContext((JString, JString), master, appname))
   end
 

src/edu/berkeley/cs/amplab/spock/JuliaFunction.java

@@ -19,6 +19,7 @@
 import java.util.Random;
 
 public class JuliaFunction implements FlatMapFunction<Iterator<JuliaObject>, JuliaObject> {
+  private static final long serialVersionUID = 1;
   final JuliaObject func;
 
   public JuliaFunction(JuliaObject func) {

src/edu/berkeley/cs/amplab/spock/JuliaObject.java

@@ -5,18 +5,23 @@
 import java.io.Serializable;
 
 class SpockException extends Exception {
+  private static final long serialVersionUID = 1;
+
   public SpockException(JuliaObject exc) {
     throw new RuntimeException("SpockException");
   }
 }
 
 class JuliaException extends SpockException {
+  private static final long serialVersionUID = 1;
+
   public JuliaException(JuliaObject exc) {
     super(exc);
   }
 }
 
 public class JuliaObject implements Serializable {
+  private static final long serialVersionUID = 1;
   byte[] payload;
 
   public JuliaObject(byte[] serializedPayload) {