aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2010-09-28 23:08:01 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2010-09-28 23:08:01 -0700
commitc7d233b9115b8eed799425a18a3ff09afa7dbad8 (patch)
tree1221fc3c733494c07f1b4f0ff16f75c22223db8e
parente5e9edeeb3612663b885643cccbc4aaeae8c00be (diff)
downloadspark-c7d233b9115b8eed799425a18a3ff09afa7dbad8.tar.gz
spark-c7d233b9115b8eed799425a18a3ff09afa7dbad8.tar.bz2
spark-c7d233b9115b8eed799425a18a3ff09afa7dbad8.zip
Added log4j jars and paths
-rw-r--r--Makefile3
-rwxr-xr-xrun3
-rw-r--r--third_party/apache-log4j-1.2.16/log4j-1.2.16.jarbin0 -> 481534 bytes
-rw-r--r--third_party/slf4j-1.6.1/slf4j-api-1.6.1.jarbin0 -> 25496 bytes
-rw-r--r--third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jarbin0 -> 9753 bytes
5 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 1a3e97a7be..c5d004fb10 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 33eec9fe1b..ab6889b157 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 0000000000..3f9d847618
--- /dev/null
+++ b/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar
Binary files 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 0000000000..42e0ad0de7
--- /dev/null
+++ b/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar
Binary files 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 0000000000..873d11983e
--- /dev/null
+++ b/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
Binary files differ