diff --git a/Makefile b/Makefile index 1a3e97a7bea9b9f1353f5bbdf77206637e115f6d..c5d004fb108e785581def5ca35961bd07ad8e2c5 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,9 @@ JARS += third_party/scalatest-1.2/scalatest-1.2.jar JARS += third_party/scalacheck_2.8.0-1.7.jar JARS += third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar JARS += third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar +JARS += third_party/apache-log4j-1.2.16/log4j-1.2.16.jar +JARS += third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar +JARS += third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar CLASSPATH = $(subst $(SPACE),:,$(JARS)) SCALA_SOURCES = src/examples/*.scala src/scala/spark/*.scala src/scala/spark/repl/*.scala diff --git a/run b/run index 33eec9fe1b21dcebe2510c9351c64e3b91cd5f41..ab6889b157fe5649765fceafd27f9d6106ccd6bb 100755 --- a/run +++ b/run @@ -38,6 +38,9 @@ SPARK_CLASSPATH+=:third_party/scalatest-1.2/scalatest-1.2.jar SPARK_CLASSPATH+=:third_party/scalacheck_2.8.0-1.7.jar SPARK_CLASSPATH+=:third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar SPARK_CLASSPATH+=:third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar +SPARK_CLASSPATH+=:third_party/apache-log4j-1.2.16/log4j-1.2.16.jar +SPARK_CLASSPATH+=:third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar +SPARK_CLASSPATH+=:third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar for jar in $FWDIR/third_party/hadoop-0.20.0/lib/*.jar; do SPARK_CLASSPATH+=:$jar done diff --git a/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar b/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar new file mode 100644 index 0000000000000000000000000000000000000000..3f9d847618bcec9c81f36ad6ee76a0f53816987f Binary files /dev/null and b/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar differ diff --git a/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar b/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..42e0ad0de7773da9b94b12f503deda7f5a506015 Binary files /dev/null and b/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar differ diff --git a/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar b/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..873d11983e18b71aeafbc3d805495d6842339812 Binary files /dev/null and b/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar differ