Initial work to get Spark compiling with SBT 0.7.5 RC0

kiszk · Nov 14, 2010 · 89fcd96 · 89fcd96
1 parent b757420
commit 89fcd96
Show file tree

Hide file tree

Showing 203 changed files with 28 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,6 @@ reports
 .project
 .classpath
 .scala_dependencies
+lib_managed/
+src_managed/
+project/boot/
diff --git a/buildfile b/buildfile
diff --git a/...arty/apache-log4j-1.2.16/log4j-1.2.16.jar → lib/apache-log4j-1.2.16/log4j-1.2.16.jar b/...arty/apache-log4j-1.2.16/log4j-1.2.16.jar → lib/apache-log4j-1.2.16/log4j-1.2.16.jar
diff --git a/third_party/asm-3.2/.DS_Store → lib/asm-3.2/.DS_Store b/third_party/asm-3.2/.DS_Store → lib/asm-3.2/.DS_Store
diff --git a/third_party/asm-3.2/lib/all/README.txt → lib/asm-3.2/lib/all/README.txt b/third_party/asm-3.2/lib/all/README.txt → lib/asm-3.2/lib/all/README.txt
diff --git a/third_party/asm-3.2/lib/all/asm-all-3.2.jar → lib/asm-3.2/lib/all/asm-all-3.2.jar b/third_party/asm-3.2/lib/all/asm-all-3.2.jar → lib/asm-3.2/lib/all/asm-all-3.2.jar
diff --git a/third_party/asm-3.2/lib/all/asm-all-3.2.pom → lib/asm-3.2/lib/all/asm-all-3.2.pom b/third_party/asm-3.2/lib/all/asm-all-3.2.pom → lib/asm-3.2/lib/all/asm-all-3.2.pom
diff --git a/...rty/asm-3.2/lib/all/asm-debug-all-3.2.jar → lib/asm-3.2/lib/all/asm-debug-all-3.2.jar b/...rty/asm-3.2/lib/all/asm-debug-all-3.2.jar → lib/asm-3.2/lib/all/asm-debug-all-3.2.jar
diff --git a/...rty/asm-3.2/lib/all/asm-debug-all-3.2.pom → lib/asm-3.2/lib/all/asm-debug-all-3.2.pom b/...rty/asm-3.2/lib/all/asm-debug-all-3.2.pom → lib/asm-3.2/lib/all/asm-debug-all-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-3.2.jar → lib/asm-3.2/lib/asm-3.2.jar b/third_party/asm-3.2/lib/asm-3.2.jar → lib/asm-3.2/lib/asm-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-3.2.pom → lib/asm-3.2/lib/asm-3.2.pom b/third_party/asm-3.2/lib/asm-3.2.pom → lib/asm-3.2/lib/asm-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-analysis-3.2.jar → lib/asm-3.2/lib/asm-analysis-3.2.jar b/third_party/asm-3.2/lib/asm-analysis-3.2.jar → lib/asm-3.2/lib/asm-analysis-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-analysis-3.2.pom → lib/asm-3.2/lib/asm-analysis-3.2.pom b/third_party/asm-3.2/lib/asm-analysis-3.2.pom → lib/asm-3.2/lib/asm-analysis-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-commons-3.2.jar → lib/asm-3.2/lib/asm-commons-3.2.jar b/third_party/asm-3.2/lib/asm-commons-3.2.jar → lib/asm-3.2/lib/asm-commons-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-commons-3.2.pom → lib/asm-3.2/lib/asm-commons-3.2.pom b/third_party/asm-3.2/lib/asm-commons-3.2.pom → lib/asm-3.2/lib/asm-commons-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-parent-3.2.pom → lib/asm-3.2/lib/asm-parent-3.2.pom b/third_party/asm-3.2/lib/asm-parent-3.2.pom → lib/asm-3.2/lib/asm-parent-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-tree-3.2.jar → lib/asm-3.2/lib/asm-tree-3.2.jar b/third_party/asm-3.2/lib/asm-tree-3.2.jar → lib/asm-3.2/lib/asm-tree-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-tree-3.2.pom → lib/asm-3.2/lib/asm-tree-3.2.pom b/third_party/asm-3.2/lib/asm-tree-3.2.pom → lib/asm-3.2/lib/asm-tree-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-util-3.2.jar → lib/asm-3.2/lib/asm-util-3.2.jar b/third_party/asm-3.2/lib/asm-util-3.2.jar → lib/asm-3.2/lib/asm-util-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-util-3.2.pom → lib/asm-3.2/lib/asm-util-3.2.pom b/third_party/asm-3.2/lib/asm-util-3.2.pom → lib/asm-3.2/lib/asm-util-3.2.pom
diff --git a/third_party/asm-3.2/lib/asm-xml-3.2.jar → lib/asm-3.2/lib/asm-xml-3.2.jar b/third_party/asm-3.2/lib/asm-xml-3.2.jar → lib/asm-3.2/lib/asm-xml-3.2.jar
diff --git a/third_party/asm-3.2/lib/asm-xml-3.2.pom → lib/asm-3.2/lib/asm-xml-3.2.pom b/third_party/asm-3.2/lib/asm-xml-3.2.pom → lib/asm-3.2/lib/asm-xml-3.2.pom
diff --git a/third_party/colt.jar → lib/colt.jar b/third_party/colt.jar → lib/colt.jar
diff --git a/third_party/guava-r07/COPYING → lib/guava-r07/COPYING b/third_party/guava-r07/COPYING → lib/guava-r07/COPYING
diff --git a/third_party/guava-r07/README → lib/guava-r07/README b/third_party/guava-r07/README → lib/guava-r07/README
diff --git a/third_party/guava-r07/guava-r07.jar → lib/guava-r07/guava-r07.jar b/third_party/guava-r07/guava-r07.jar → lib/guava-r07/guava-r07.jar
diff --git a/third_party/hadoop-0.20.0/.DS_Store → lib/hadoop-0.20.0/.DS_Store b/third_party/hadoop-0.20.0/.DS_Store → lib/hadoop-0.20.0/.DS_Store
diff --git a/third_party/hadoop-0.20.0/CHANGES.txt → lib/hadoop-0.20.0/CHANGES.txt b/third_party/hadoop-0.20.0/CHANGES.txt → lib/hadoop-0.20.0/CHANGES.txt
diff --git a/third_party/hadoop-0.20.0/LICENSE.txt → lib/hadoop-0.20.0/LICENSE.txt b/third_party/hadoop-0.20.0/LICENSE.txt → lib/hadoop-0.20.0/LICENSE.txt
diff --git a/third_party/hadoop-0.20.0/NOTICE.txt → lib/hadoop-0.20.0/NOTICE.txt b/third_party/hadoop-0.20.0/NOTICE.txt → lib/hadoop-0.20.0/NOTICE.txt
diff --git a/third_party/hadoop-0.20.0/README.txt → lib/hadoop-0.20.0/README.txt b/third_party/hadoop-0.20.0/README.txt → lib/hadoop-0.20.0/README.txt
diff --git a/third_party/hadoop-0.20.0/bin/hadoop → lib/hadoop-0.20.0/bin/hadoop b/third_party/hadoop-0.20.0/bin/hadoop → lib/hadoop-0.20.0/bin/hadoop
diff --git a/..._party/hadoop-0.20.0/bin/hadoop-config.sh → lib/hadoop-0.20.0/bin/hadoop-config.sh b/..._party/hadoop-0.20.0/bin/hadoop-config.sh → lib/hadoop-0.20.0/bin/hadoop-config.sh
diff --git a/..._party/hadoop-0.20.0/bin/hadoop-daemon.sh → lib/hadoop-0.20.0/bin/hadoop-daemon.sh b/..._party/hadoop-0.20.0/bin/hadoop-daemon.sh → lib/hadoop-0.20.0/bin/hadoop-daemon.sh
diff --git a/...party/hadoop-0.20.0/bin/hadoop-daemons.sh → lib/hadoop-0.20.0/bin/hadoop-daemons.sh b/...party/hadoop-0.20.0/bin/hadoop-daemons.sh → lib/hadoop-0.20.0/bin/hadoop-daemons.sh
diff --git a/third_party/hadoop-0.20.0/bin/rcc → lib/hadoop-0.20.0/bin/rcc b/third_party/hadoop-0.20.0/bin/rcc → lib/hadoop-0.20.0/bin/rcc
diff --git a/third_party/hadoop-0.20.0/bin/slaves.sh → lib/hadoop-0.20.0/bin/slaves.sh b/third_party/hadoop-0.20.0/bin/slaves.sh → lib/hadoop-0.20.0/bin/slaves.sh
diff --git a/third_party/hadoop-0.20.0/bin/start-all.sh → lib/hadoop-0.20.0/bin/start-all.sh b/third_party/hadoop-0.20.0/bin/start-all.sh → lib/hadoop-0.20.0/bin/start-all.sh
diff --git a/...party/hadoop-0.20.0/bin/start-balancer.sh → lib/hadoop-0.20.0/bin/start-balancer.sh b/...party/hadoop-0.20.0/bin/start-balancer.sh → lib/hadoop-0.20.0/bin/start-balancer.sh
diff --git a/third_party/hadoop-0.20.0/bin/start-dfs.sh → lib/hadoop-0.20.0/bin/start-dfs.sh b/third_party/hadoop-0.20.0/bin/start-dfs.sh → lib/hadoop-0.20.0/bin/start-dfs.sh
diff --git a/...d_party/hadoop-0.20.0/bin/start-mapred.sh → lib/hadoop-0.20.0/bin/start-mapred.sh b/...d_party/hadoop-0.20.0/bin/start-mapred.sh → lib/hadoop-0.20.0/bin/start-mapred.sh
diff --git a/third_party/hadoop-0.20.0/bin/stop-all.sh → lib/hadoop-0.20.0/bin/stop-all.sh b/third_party/hadoop-0.20.0/bin/stop-all.sh → lib/hadoop-0.20.0/bin/stop-all.sh
diff --git a/..._party/hadoop-0.20.0/bin/stop-balancer.sh → lib/hadoop-0.20.0/bin/stop-balancer.sh b/..._party/hadoop-0.20.0/bin/stop-balancer.sh → lib/hadoop-0.20.0/bin/stop-balancer.sh
diff --git a/third_party/hadoop-0.20.0/bin/stop-dfs.sh → lib/hadoop-0.20.0/bin/stop-dfs.sh b/third_party/hadoop-0.20.0/bin/stop-dfs.sh → lib/hadoop-0.20.0/bin/stop-dfs.sh
diff --git a/third_party/hadoop-0.20.0/bin/stop-mapred.sh → lib/hadoop-0.20.0/bin/stop-mapred.sh b/third_party/hadoop-0.20.0/bin/stop-mapred.sh → lib/hadoop-0.20.0/bin/stop-mapred.sh
diff --git a/third_party/hadoop-0.20.0/build.xml → lib/hadoop-0.20.0/build.xml b/third_party/hadoop-0.20.0/build.xml → lib/hadoop-0.20.0/build.xml
diff --git a/...++/Linux-amd64-64/include/hadoop/Pipes.hh → ...++/Linux-amd64-64/include/hadoop/Pipes.hh b/...++/Linux-amd64-64/include/hadoop/Pipes.hh → ...++/Linux-amd64-64/include/hadoop/Pipes.hh
diff --git a/...ux-amd64-64/include/hadoop/SerialUtils.hh → ...ux-amd64-64/include/hadoop/SerialUtils.hh b/...ux-amd64-64/include/hadoop/SerialUtils.hh → ...ux-amd64-64/include/hadoop/SerialUtils.hh
diff --git a/...ux-amd64-64/include/hadoop/StringUtils.hh → ...ux-amd64-64/include/hadoop/StringUtils.hh b/...ux-amd64-64/include/hadoop/StringUtils.hh → ...ux-amd64-64/include/hadoop/StringUtils.hh
diff --git a/...md64-64/include/hadoop/TemplateFactory.hh → ...md64-64/include/hadoop/TemplateFactory.hh b/...md64-64/include/hadoop/TemplateFactory.hh → ...md64-64/include/hadoop/TemplateFactory.hh
diff --git a/...0/c++/Linux-amd64-64/lib/libhadooppipes.a → ...0/c++/Linux-amd64-64/lib/libhadooppipes.a b/...0/c++/Linux-amd64-64/lib/libhadooppipes.a → ...0/c++/Linux-amd64-64/lib/libhadooppipes.a
diff --git a/...0/c++/Linux-amd64-64/lib/libhadooputils.a → ...0/c++/Linux-amd64-64/lib/libhadooputils.a b/...0/c++/Linux-amd64-64/lib/libhadooputils.a → ...0/c++/Linux-amd64-64/lib/libhadooputils.a
diff --git a/...c++/Linux-i386-32/include/hadoop/Pipes.hh → ...c++/Linux-i386-32/include/hadoop/Pipes.hh b/...c++/Linux-i386-32/include/hadoop/Pipes.hh → ...c++/Linux-i386-32/include/hadoop/Pipes.hh
diff --git a/...nux-i386-32/include/hadoop/SerialUtils.hh → ...nux-i386-32/include/hadoop/SerialUtils.hh b/...nux-i386-32/include/hadoop/SerialUtils.hh → ...nux-i386-32/include/hadoop/SerialUtils.hh
diff --git a/...nux-i386-32/include/hadoop/StringUtils.hh → ...nux-i386-32/include/hadoop/StringUtils.hh b/...nux-i386-32/include/hadoop/StringUtils.hh → ...nux-i386-32/include/hadoop/StringUtils.hh
diff --git a/...i386-32/include/hadoop/TemplateFactory.hh → ...i386-32/include/hadoop/TemplateFactory.hh b/...i386-32/include/hadoop/TemplateFactory.hh → ...i386-32/include/hadoop/TemplateFactory.hh
diff --git a/....0/c++/Linux-i386-32/lib/libhadooppipes.a → ....0/c++/Linux-i386-32/lib/libhadooppipes.a b/....0/c++/Linux-i386-32/lib/libhadooppipes.a → ....0/c++/Linux-i386-32/lib/libhadooppipes.a
diff --git a/....0/c++/Linux-i386-32/lib/libhadooputils.a → ....0/c++/Linux-i386-32/lib/libhadooputils.a b/....0/c++/Linux-i386-32/lib/libhadooputils.a → ....0/c++/Linux-i386-32/lib/libhadooputils.a
diff --git a/...p-0.20.0/c++/Linux-i386-32/lib/libhdfs.la → ...p-0.20.0/c++/Linux-i386-32/lib/libhdfs.la b/...p-0.20.0/c++/Linux-i386-32/lib/libhdfs.la → ...p-0.20.0/c++/Linux-i386-32/lib/libhdfs.la
diff --git a/...p-0.20.0/c++/Linux-i386-32/lib/libhdfs.so → ...p-0.20.0/c++/Linux-i386-32/lib/libhdfs.so b/...p-0.20.0/c++/Linux-i386-32/lib/libhdfs.so → ...p-0.20.0/c++/Linux-i386-32/lib/libhdfs.so
diff --git a/...0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0 → ...0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0 b/...0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0 → ...0.20.0/c++/Linux-i386-32/lib/libhdfs.so.0
diff --git a/....0/c++/Linux-i386-32/lib/libhdfs.so.0.0.0 → ....0/c++/Linux-i386-32/lib/libhdfs.so.0.0.0 b/....0/c++/Linux-i386-32/lib/libhdfs.so.0.0.0 → ....0/c++/Linux-i386-32/lib/libhdfs.so.0.0.0
diff --git a/...hadoop-0.20.0/conf/capacity-scheduler.xml → ...hadoop-0.20.0/conf/capacity-scheduler.xml b/...hadoop-0.20.0/conf/capacity-scheduler.xml → ...hadoop-0.20.0/conf/capacity-scheduler.xml
diff --git a/...arty/hadoop-0.20.0/conf/configuration.xsl → lib/hadoop-0.20.0/conf/configuration.xsl b/...arty/hadoop-0.20.0/conf/configuration.xsl → lib/hadoop-0.20.0/conf/configuration.xsl
diff --git a/third_party/hadoop-0.20.0/conf/core-site.xml → lib/hadoop-0.20.0/conf/core-site.xml b/third_party/hadoop-0.20.0/conf/core-site.xml → lib/hadoop-0.20.0/conf/core-site.xml
diff --git a/third_party/hadoop-0.20.0/conf/hadoop-env.sh → lib/hadoop-0.20.0/conf/hadoop-env.sh b/third_party/hadoop-0.20.0/conf/hadoop-env.sh → lib/hadoop-0.20.0/conf/hadoop-env.sh
diff --git a/...oop-0.20.0/conf/hadoop-metrics.properties → ...oop-0.20.0/conf/hadoop-metrics.properties b/...oop-0.20.0/conf/hadoop-metrics.properties → ...oop-0.20.0/conf/hadoop-metrics.properties
diff --git a/...arty/hadoop-0.20.0/conf/hadoop-policy.xml → lib/hadoop-0.20.0/conf/hadoop-policy.xml b/...arty/hadoop-0.20.0/conf/hadoop-policy.xml → lib/hadoop-0.20.0/conf/hadoop-policy.xml
diff --git a/third_party/hadoop-0.20.0/conf/hdfs-site.xml → lib/hadoop-0.20.0/conf/hdfs-site.xml b/third_party/hadoop-0.20.0/conf/hdfs-site.xml → lib/hadoop-0.20.0/conf/hdfs-site.xml
diff --git a/...party/hadoop-0.20.0/conf/log4j.properties → lib/hadoop-0.20.0/conf/log4j.properties b/...party/hadoop-0.20.0/conf/log4j.properties → lib/hadoop-0.20.0/conf/log4j.properties
diff --git a/..._party/hadoop-0.20.0/conf/mapred-site.xml → lib/hadoop-0.20.0/conf/mapred-site.xml b/..._party/hadoop-0.20.0/conf/mapred-site.xml → lib/hadoop-0.20.0/conf/mapred-site.xml
diff --git a/third_party/hadoop-0.20.0/conf/masters → lib/hadoop-0.20.0/conf/masters b/third_party/hadoop-0.20.0/conf/masters → lib/hadoop-0.20.0/conf/masters
diff --git a/third_party/hadoop-0.20.0/conf/slaves → lib/hadoop-0.20.0/conf/slaves b/third_party/hadoop-0.20.0/conf/slaves → lib/hadoop-0.20.0/conf/slaves
diff --git a/...hadoop-0.20.0/conf/ssl-client.xml.example → ...hadoop-0.20.0/conf/ssl-client.xml.example b/...hadoop-0.20.0/conf/ssl-client.xml.example → ...hadoop-0.20.0/conf/ssl-client.xml.example
diff --git a/...hadoop-0.20.0/conf/ssl-server.xml.example → ...hadoop-0.20.0/conf/ssl-server.xml.example b/...hadoop-0.20.0/conf/ssl-server.xml.example → ...hadoop-0.20.0/conf/ssl-server.xml.example
diff --git a/...uler/hadoop-0.20.0-capacity-scheduler.jar → ...uler/hadoop-0.20.0-capacity-scheduler.jar b/...uler/hadoop-0.20.0-capacity-scheduler.jar → ...uler/hadoop-0.20.0-capacity-scheduler.jar
diff --git a/...ntrib/datajoin/hadoop-0.20.0-datajoin.jar → ...ntrib/datajoin/hadoop-0.20.0-datajoin.jar b/...ntrib/datajoin/hadoop-0.20.0-datajoin.jar → ...ntrib/datajoin/hadoop-0.20.0-datajoin.jar
diff --git a/...e-plugin/hadoop-0.20.0-eclipse-plugin.jar → ...e-plugin/hadoop-0.20.0-eclipse-plugin.jar b/...e-plugin/hadoop-0.20.0-eclipse-plugin.jar → ...e-plugin/hadoop-0.20.0-eclipse-plugin.jar
diff --git a/...scheduler/hadoop-0.20.0-fairscheduler.jar → ...scheduler/hadoop-0.20.0-fairscheduler.jar b/...scheduler/hadoop-0.20.0-fairscheduler.jar → ...scheduler/hadoop-0.20.0-fairscheduler.jar
diff --git a/...ty/hadoop-0.20.0/contrib/hdfsproxy/README → lib/hadoop-0.20.0/contrib/hdfsproxy/README b/...ty/hadoop-0.20.0/contrib/hdfsproxy/README → lib/hadoop-0.20.0/contrib/hdfsproxy/README
diff --git a/...op-0.20.0/contrib/hdfsproxy/bin/hdfsproxy → ...op-0.20.0/contrib/hdfsproxy/bin/hdfsproxy b/...op-0.20.0/contrib/hdfsproxy/bin/hdfsproxy → ...op-0.20.0/contrib/hdfsproxy/bin/hdfsproxy
diff --git a/...contrib/hdfsproxy/bin/hdfsproxy-config.sh → ...contrib/hdfsproxy/bin/hdfsproxy-config.sh b/...contrib/hdfsproxy/bin/hdfsproxy-config.sh → ...contrib/hdfsproxy/bin/hdfsproxy-config.sh
diff --git a/...contrib/hdfsproxy/bin/hdfsproxy-daemon.sh → ...contrib/hdfsproxy/bin/hdfsproxy-daemon.sh b/...contrib/hdfsproxy/bin/hdfsproxy-daemon.sh → ...contrib/hdfsproxy/bin/hdfsproxy-daemon.sh
diff --git a/...ontrib/hdfsproxy/bin/hdfsproxy-daemons.sh → ...ontrib/hdfsproxy/bin/hdfsproxy-daemons.sh b/...ontrib/hdfsproxy/bin/hdfsproxy-daemons.sh → ...ontrib/hdfsproxy/bin/hdfsproxy-daemons.sh
diff --git a/...contrib/hdfsproxy/bin/hdfsproxy-slaves.sh → ...contrib/hdfsproxy/bin/hdfsproxy-slaves.sh b/...contrib/hdfsproxy/bin/hdfsproxy-slaves.sh → ...contrib/hdfsproxy/bin/hdfsproxy-slaves.sh
diff --git a/.../contrib/hdfsproxy/bin/start-hdfsproxy.sh → .../contrib/hdfsproxy/bin/start-hdfsproxy.sh b/.../contrib/hdfsproxy/bin/start-hdfsproxy.sh → .../contrib/hdfsproxy/bin/start-hdfsproxy.sh
diff --git a/...0/contrib/hdfsproxy/bin/stop-hdfsproxy.sh → ...0/contrib/hdfsproxy/bin/stop-hdfsproxy.sh b/...0/contrib/hdfsproxy/bin/stop-hdfsproxy.sh → ...0/contrib/hdfsproxy/bin/stop-hdfsproxy.sh
diff --git a/...hadoop-0.20.0/contrib/hdfsproxy/build.xml → ...hadoop-0.20.0/contrib/hdfsproxy/build.xml b/...hadoop-0.20.0/contrib/hdfsproxy/build.xml → ...hadoop-0.20.0/contrib/hdfsproxy/build.xml
diff --git a/.../contrib/hdfsproxy/conf/configuration.xsl → .../contrib/hdfsproxy/conf/configuration.xsl b/.../contrib/hdfsproxy/conf/configuration.xsl → .../contrib/hdfsproxy/conf/configuration.xsl
diff --git a/...trib/hdfsproxy/conf/hdfsproxy-default.xml → ...trib/hdfsproxy/conf/hdfsproxy-default.xml b/...trib/hdfsproxy/conf/hdfsproxy-default.xml → ...trib/hdfsproxy/conf/hdfsproxy-default.xml
diff --git a/...0/contrib/hdfsproxy/conf/hdfsproxy-env.sh → ...0/contrib/hdfsproxy/conf/hdfsproxy-env.sh b/...0/contrib/hdfsproxy/conf/hdfsproxy-env.sh → ...0/contrib/hdfsproxy/conf/hdfsproxy-env.sh
diff --git a/.../hdfsproxy/conf/hdfsproxy-env.sh.template → .../hdfsproxy/conf/hdfsproxy-env.sh.template b/.../hdfsproxy/conf/hdfsproxy-env.sh.template → .../hdfsproxy/conf/hdfsproxy-env.sh.template
diff --git a/....0/contrib/hdfsproxy/conf/hdfsproxy-hosts → ....0/contrib/hdfsproxy/conf/hdfsproxy-hosts b/....0/contrib/hdfsproxy/conf/hdfsproxy-hosts → ....0/contrib/hdfsproxy/conf/hdfsproxy-hosts
diff --git a/...0/contrib/hdfsproxy/conf/log4j.properties → ...0/contrib/hdfsproxy/conf/log4j.properties b/...0/contrib/hdfsproxy/conf/log4j.properties → ...0/contrib/hdfsproxy/conf/log4j.properties
diff --git a/...0.0/contrib/hdfsproxy/conf/user-certs.xml → ...0.0/contrib/hdfsproxy/conf/user-certs.xml b/...0.0/contrib/hdfsproxy/conf/user-certs.xml → ...0.0/contrib/hdfsproxy/conf/user-certs.xml
diff --git a/...ntrib/hdfsproxy/conf/user-permissions.xml → ...ntrib/hdfsproxy/conf/user-permissions.xml b/...ntrib/hdfsproxy/conf/user-permissions.xml → ...ntrib/hdfsproxy/conf/user-permissions.xml
diff --git a/....20.0/contrib/hdfsproxy/hdfsproxy-1.0.jar → ....20.0/contrib/hdfsproxy/hdfsproxy-1.0.jar b/....20.0/contrib/hdfsproxy/hdfsproxy-1.0.jar → ....20.0/contrib/hdfsproxy/hdfsproxy-1.0.jar
diff --git a/...0.0/contrib/index/hadoop-0.20.0-index.jar → ...0.0/contrib/index/hadoop-0.20.0-index.jar b/...0.0/contrib/index/hadoop-0.20.0-index.jar → ...0.0/contrib/index/hadoop-0.20.0-index.jar
diff --git a/...rib/streaming/hadoop-0.20.0-streaming.jar → ...rib/streaming/hadoop-0.20.0-streaming.jar b/...rib/streaming/hadoop-0.20.0-streaming.jar → ...rib/streaming/hadoop-0.20.0-streaming.jar
diff --git a/...ntrib/thriftfs/hadoop-0.20.0-thriftfs.jar → ...ntrib/thriftfs/hadoop-0.20.0-thriftfs.jar b/...ntrib/thriftfs/hadoop-0.20.0-thriftfs.jar → ...ntrib/thriftfs/hadoop-0.20.0-thriftfs.jar
diff --git a/...adoop-0.20.0/contrib/vaidya/bin/vaidya.sh → ...adoop-0.20.0/contrib/vaidya/bin/vaidya.sh b/...adoop-0.20.0/contrib/vaidya/bin/vaidya.sh → ...adoop-0.20.0/contrib/vaidya/bin/vaidya.sh
diff --git a/...ib/vaidya/conf/postex_diagnosis_tests.xml → ...ib/vaidya/conf/postex_diagnosis_tests.xml b/...ib/vaidya/conf/postex_diagnosis_tests.xml → ...ib/vaidya/conf/postex_diagnosis_tests.xml
diff --git a/...0/contrib/vaidya/hadoop-0.20.0-vaidya.jar → ...0/contrib/vaidya/hadoop-0.20.0-vaidya.jar b/...0/contrib/vaidya/hadoop-0.20.0-vaidya.jar → ...0/contrib/vaidya/hadoop-0.20.0-vaidya.jar
diff --git a/...party/hadoop-0.20.0/hadoop-0.20.0-ant.jar → lib/hadoop-0.20.0/hadoop-0.20.0-ant.jar b/...party/hadoop-0.20.0/hadoop-0.20.0-ant.jar → lib/hadoop-0.20.0/hadoop-0.20.0-ant.jar
diff --git a/...arty/hadoop-0.20.0/hadoop-0.20.0-core.jar → lib/hadoop-0.20.0/hadoop-0.20.0-core.jar b/...arty/hadoop-0.20.0/hadoop-0.20.0-core.jar → lib/hadoop-0.20.0/hadoop-0.20.0-core.jar
diff --git a/.../hadoop-0.20.0/hadoop-0.20.0-examples.jar → lib/hadoop-0.20.0/hadoop-0.20.0-examples.jar b/.../hadoop-0.20.0/hadoop-0.20.0-examples.jar → lib/hadoop-0.20.0/hadoop-0.20.0-examples.jar
diff --git a/...arty/hadoop-0.20.0/hadoop-0.20.0-test.jar → lib/hadoop-0.20.0/hadoop-0.20.0-test.jar b/...arty/hadoop-0.20.0/hadoop-0.20.0-test.jar → lib/hadoop-0.20.0/hadoop-0.20.0-test.jar
diff --git a/...rty/hadoop-0.20.0/hadoop-0.20.0-tools.jar → lib/hadoop-0.20.0/hadoop-0.20.0-tools.jar b/...rty/hadoop-0.20.0/hadoop-0.20.0-tools.jar → lib/hadoop-0.20.0/hadoop-0.20.0-tools.jar
diff --git a/third_party/hadoop-0.20.0/ivy.xml → lib/hadoop-0.20.0/ivy.xml b/third_party/hadoop-0.20.0/ivy.xml → lib/hadoop-0.20.0/ivy.xml
diff --git a/...d_party/hadoop-0.20.0/ivy/hadoop-core.pom → lib/hadoop-0.20.0/ivy/hadoop-core.pom b/...d_party/hadoop-0.20.0/ivy/hadoop-core.pom → lib/hadoop-0.20.0/ivy/hadoop-core.pom
diff --git a/...party/hadoop-0.20.0/ivy/ivy-2.0.0-rc2.jar → lib/hadoop-0.20.0/ivy/ivy-2.0.0-rc2.jar b/...party/hadoop-0.20.0/ivy/ivy-2.0.0-rc2.jar → lib/hadoop-0.20.0/ivy/ivy-2.0.0-rc2.jar
diff --git a/...d_party/hadoop-0.20.0/ivy/ivysettings.xml → lib/hadoop-0.20.0/ivy/ivysettings.xml b/...d_party/hadoop-0.20.0/ivy/ivysettings.xml → lib/hadoop-0.20.0/ivy/ivysettings.xml
diff --git a/...ty/hadoop-0.20.0/ivy/libraries.properties → lib/hadoop-0.20.0/ivy/libraries.properties b/...ty/hadoop-0.20.0/ivy/libraries.properties → lib/hadoop-0.20.0/ivy/libraries.properties
diff --git a/third_party/hadoop-0.20.0/lib/.DS_Store → lib/hadoop-0.20.0/lib/.DS_Store b/third_party/hadoop-0.20.0/lib/.DS_Store → lib/hadoop-0.20.0/lib/.DS_Store
diff --git a/...p-0.20.0/lib/commons-cli-2.0-SNAPSHOT.jar → ...p-0.20.0/lib/commons-cli-2.0-SNAPSHOT.jar b/...p-0.20.0/lib/commons-cli-2.0-SNAPSHOT.jar → ...p-0.20.0/lib/commons-cli-2.0-SNAPSHOT.jar
diff --git a/...y/hadoop-0.20.0/lib/commons-codec-1.3.jar → lib/hadoop-0.20.0/lib/commons-codec-1.3.jar b/...y/hadoop-0.20.0/lib/commons-codec-1.3.jar → lib/hadoop-0.20.0/lib/commons-codec-1.3.jar
diff --git a/...arty/hadoop-0.20.0/lib/commons-el-1.0.jar → lib/hadoop-0.20.0/lib/commons-el-1.0.jar b/...arty/hadoop-0.20.0/lib/commons-el-1.0.jar → lib/hadoop-0.20.0/lib/commons-el-1.0.jar
diff --git a/...p-0.20.0/lib/commons-httpclient-3.0.1.jar → ...p-0.20.0/lib/commons-httpclient-3.0.1.jar b/...p-0.20.0/lib/commons-httpclient-3.0.1.jar → ...p-0.20.0/lib/commons-httpclient-3.0.1.jar
diff --git a/...doop-0.20.0/lib/commons-logging-1.0.4.jar → ...doop-0.20.0/lib/commons-logging-1.0.4.jar b/...doop-0.20.0/lib/commons-logging-1.0.4.jar → ...doop-0.20.0/lib/commons-logging-1.0.4.jar
diff --git a/...-0.20.0/lib/commons-logging-api-1.0.4.jar → ...-0.20.0/lib/commons-logging-api-1.0.4.jar b/...-0.20.0/lib/commons-logging-api-1.0.4.jar → ...-0.20.0/lib/commons-logging-api-1.0.4.jar
diff --git a/...y/hadoop-0.20.0/lib/commons-net-1.4.1.jar → lib/hadoop-0.20.0/lib/commons-net-1.4.1.jar b/...y/hadoop-0.20.0/lib/commons-net-1.4.1.jar → lib/hadoop-0.20.0/lib/commons-net-1.4.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/core-3.1.1.jar → lib/hadoop-0.20.0/lib/core-3.1.1.jar b/third_party/hadoop-0.20.0/lib/core-3.1.1.jar → lib/hadoop-0.20.0/lib/core-3.1.1.jar
diff --git a/...op-0.20.0/lib/hsqldb-1.8.0.10.LICENSE.txt → ...op-0.20.0/lib/hsqldb-1.8.0.10.LICENSE.txt b/...op-0.20.0/lib/hsqldb-1.8.0.10.LICENSE.txt → ...op-0.20.0/lib/hsqldb-1.8.0.10.LICENSE.txt
diff --git a/...rty/hadoop-0.20.0/lib/hsqldb-1.8.0.10.jar → lib/hadoop-0.20.0/lib/hsqldb-1.8.0.10.jar b/...rty/hadoop-0.20.0/lib/hsqldb-1.8.0.10.jar → lib/hadoop-0.20.0/lib/hsqldb-1.8.0.10.jar
diff --git a/...oop-0.20.0/lib/jasper-compiler-5.5.12.jar → ...oop-0.20.0/lib/jasper-compiler-5.5.12.jar b/...oop-0.20.0/lib/jasper-compiler-5.5.12.jar → ...oop-0.20.0/lib/jasper-compiler-5.5.12.jar
diff --git a/...doop-0.20.0/lib/jasper-runtime-5.5.12.jar → ...doop-0.20.0/lib/jasper-runtime-5.5.12.jar b/...doop-0.20.0/lib/jasper-runtime-5.5.12.jar → ...doop-0.20.0/lib/jasper-runtime-5.5.12.jar
diff --git a/...hadoop-0.20.0/lib/jdiff/hadoop_0.17.0.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.17.0.xml b/...hadoop-0.20.0/lib/jdiff/hadoop_0.17.0.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.17.0.xml
diff --git a/...hadoop-0.20.0/lib/jdiff/hadoop_0.18.1.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.18.1.xml b/...hadoop-0.20.0/lib/jdiff/hadoop_0.18.1.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.18.1.xml
diff --git a/...hadoop-0.20.0/lib/jdiff/hadoop_0.18.2.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.18.2.xml b/...hadoop-0.20.0/lib/jdiff/hadoop_0.18.2.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.18.2.xml
diff --git a/...hadoop-0.20.0/lib/jdiff/hadoop_0.18.3.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.18.3.xml b/...hadoop-0.20.0/lib/jdiff/hadoop_0.18.3.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.18.3.xml
diff --git a/...hadoop-0.20.0/lib/jdiff/hadoop_0.19.0.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.19.0.xml b/...hadoop-0.20.0/lib/jdiff/hadoop_0.19.0.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.19.0.xml
diff --git a/...hadoop-0.20.0/lib/jdiff/hadoop_0.19.1.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.19.1.xml b/...hadoop-0.20.0/lib/jdiff/hadoop_0.19.1.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.19.1.xml
diff --git a/...hadoop-0.20.0/lib/jdiff/hadoop_0.20.0.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.20.0.xml b/...hadoop-0.20.0/lib/jdiff/hadoop_0.20.0.xml → ...hadoop-0.20.0/lib/jdiff/hadoop_0.20.0.xml
diff --git a/..._party/hadoop-0.20.0/lib/jets3t-0.6.1.jar → lib/hadoop-0.20.0/lib/jets3t-0.6.1.jar b/..._party/hadoop-0.20.0/lib/jets3t-0.6.1.jar → lib/hadoop-0.20.0/lib/jets3t-0.6.1.jar
diff --git a/..._party/hadoop-0.20.0/lib/jetty-6.1.14.jar → lib/hadoop-0.20.0/lib/jetty-6.1.14.jar b/..._party/hadoop-0.20.0/lib/jetty-6.1.14.jar → lib/hadoop-0.20.0/lib/jetty-6.1.14.jar
diff --git a/...y/hadoop-0.20.0/lib/jetty-util-6.1.14.jar → lib/hadoop-0.20.0/lib/jetty-util-6.1.14.jar b/...y/hadoop-0.20.0/lib/jetty-util-6.1.14.jar → lib/hadoop-0.20.0/lib/jetty-util-6.1.14.jar
diff --git a/...rty/hadoop-0.20.0/lib/jsp-2.1/jsp-2.1.jar → lib/hadoop-0.20.0/lib/jsp-2.1/jsp-2.1.jar b/...rty/hadoop-0.20.0/lib/jsp-2.1/jsp-2.1.jar → lib/hadoop-0.20.0/lib/jsp-2.1/jsp-2.1.jar
diff --git a/...hadoop-0.20.0/lib/jsp-2.1/jsp-api-2.1.jar → ...hadoop-0.20.0/lib/jsp-2.1/jsp-api-2.1.jar b/...hadoop-0.20.0/lib/jsp-2.1/jsp-api-2.1.jar → ...hadoop-0.20.0/lib/jsp-2.1/jsp-api-2.1.jar
diff --git a/...d_party/hadoop-0.20.0/lib/junit-3.8.1.jar → lib/hadoop-0.20.0/lib/junit-3.8.1.jar b/...d_party/hadoop-0.20.0/lib/junit-3.8.1.jar → lib/hadoop-0.20.0/lib/junit-3.8.1.jar
diff --git a/third_party/hadoop-0.20.0/lib/kfs-0.2.2.jar → lib/hadoop-0.20.0/lib/kfs-0.2.2.jar b/third_party/hadoop-0.20.0/lib/kfs-0.2.2.jar → lib/hadoop-0.20.0/lib/kfs-0.2.2.jar
diff --git a/...rty/hadoop-0.20.0/lib/kfs-0.2.LICENSE.txt → lib/hadoop-0.20.0/lib/kfs-0.2.LICENSE.txt b/...rty/hadoop-0.20.0/lib/kfs-0.2.LICENSE.txt → lib/hadoop-0.20.0/lib/kfs-0.2.LICENSE.txt
diff --git a/..._party/hadoop-0.20.0/lib/log4j-1.2.15.jar → lib/hadoop-0.20.0/lib/log4j-1.2.15.jar b/..._party/hadoop-0.20.0/lib/log4j-1.2.15.jar → lib/hadoop-0.20.0/lib/log4j-1.2.15.jar
diff --git a/..._party/hadoop-0.20.0/lib/native/.DS_Store → lib/hadoop-0.20.0/lib/native/.DS_Store b/..._party/hadoop-0.20.0/lib/native/.DS_Store → lib/hadoop-0.20.0/lib/native/.DS_Store
diff --git a/...0.0/lib/native/Linux-amd64-64/libhadoop.a → ...0.0/lib/native/Linux-amd64-64/libhadoop.a b/...0.0/lib/native/Linux-amd64-64/libhadoop.a → ...0.0/lib/native/Linux-amd64-64/libhadoop.a
diff --git a/....0/lib/native/Linux-amd64-64/libhadoop.la → ....0/lib/native/Linux-amd64-64/libhadoop.la b/....0/lib/native/Linux-amd64-64/libhadoop.la → ....0/lib/native/Linux-amd64-64/libhadoop.la
diff --git a/....0/lib/native/Linux-amd64-64/libhadoop.so → ....0/lib/native/Linux-amd64-64/libhadoop.so b/....0/lib/native/Linux-amd64-64/libhadoop.so → ....0/lib/native/Linux-amd64-64/libhadoop.so
diff --git a/.../lib/native/Linux-amd64-64/libhadoop.so.1 → .../lib/native/Linux-amd64-64/libhadoop.so.1 b/.../lib/native/Linux-amd64-64/libhadoop.so.1 → .../lib/native/Linux-amd64-64/libhadoop.so.1
diff --git a/.../native/Linux-amd64-64/libhadoop.so.1.0.0 → .../native/Linux-amd64-64/libhadoop.so.1.0.0 b/.../native/Linux-amd64-64/libhadoop.so.1.0.0 → .../native/Linux-amd64-64/libhadoop.so.1.0.0
diff --git a/...20.0/lib/native/Linux-i386-32/libhadoop.a → ...20.0/lib/native/Linux-i386-32/libhadoop.a b/...20.0/lib/native/Linux-i386-32/libhadoop.a → ...20.0/lib/native/Linux-i386-32/libhadoop.a
diff --git a/...0.0/lib/native/Linux-i386-32/libhadoop.la → ...0.0/lib/native/Linux-i386-32/libhadoop.la b/...0.0/lib/native/Linux-i386-32/libhadoop.la → ...0.0/lib/native/Linux-i386-32/libhadoop.la
diff --git a/...0.0/lib/native/Linux-i386-32/libhadoop.so → ...0.0/lib/native/Linux-i386-32/libhadoop.so b/...0.0/lib/native/Linux-i386-32/libhadoop.so → ...0.0/lib/native/Linux-i386-32/libhadoop.so
diff --git a/...0/lib/native/Linux-i386-32/libhadoop.so.1 → ...0/lib/native/Linux-i386-32/libhadoop.so.1 b/...0/lib/native/Linux-i386-32/libhadoop.so.1 → ...0/lib/native/Linux-i386-32/libhadoop.so.1
diff --git a/...b/native/Linux-i386-32/libhadoop.so.1.0.0 → ...b/native/Linux-i386-32/libhadoop.so.1.0.0 b/...b/native/Linux-i386-32/libhadoop.so.1.0.0 → ...b/native/Linux-i386-32/libhadoop.so.1.0.0
diff --git a/third_party/hadoop-0.20.0/lib/oro-2.0.8.jar → lib/hadoop-0.20.0/lib/oro-2.0.8.jar b/third_party/hadoop-0.20.0/lib/oro-2.0.8.jar → lib/hadoop-0.20.0/lib/oro-2.0.8.jar
diff --git a/...oop-0.20.0/lib/servlet-api-2.5-6.1.14.jar → ...oop-0.20.0/lib/servlet-api-2.5-6.1.14.jar b/...oop-0.20.0/lib/servlet-api-2.5-6.1.14.jar → ...oop-0.20.0/lib/servlet-api-2.5-6.1.14.jar
diff --git a/...d_party/hadoop-0.20.0/lib/xmlenc-0.52.jar → lib/hadoop-0.20.0/lib/xmlenc-0.52.jar b/...d_party/hadoop-0.20.0/lib/xmlenc-0.52.jar → lib/hadoop-0.20.0/lib/xmlenc-0.52.jar
diff --git a/...y/hadoop-0.20.0/librecordio/librecordio.a → lib/hadoop-0.20.0/librecordio/librecordio.a b/...y/hadoop-0.20.0/librecordio/librecordio.a → lib/hadoop-0.20.0/librecordio/librecordio.a
diff --git a/...p-0.20.0/webapps/datanode/WEB-INF/web.xml → ...p-0.20.0/webapps/datanode/WEB-INF/web.xml b/...p-0.20.0/webapps/datanode/WEB-INF/web.xml → ...p-0.20.0/webapps/datanode/WEB-INF/web.xml
diff --git a/...adoop-0.20.0/webapps/hdfs/WEB-INF/web.xml → ...adoop-0.20.0/webapps/hdfs/WEB-INF/web.xml b/...adoop-0.20.0/webapps/hdfs/WEB-INF/web.xml → ...adoop-0.20.0/webapps/hdfs/WEB-INF/web.xml
diff --git a/...rty/hadoop-0.20.0/webapps/hdfs/index.html → lib/hadoop-0.20.0/webapps/hdfs/index.html b/...rty/hadoop-0.20.0/webapps/hdfs/index.html → lib/hadoop-0.20.0/webapps/hdfs/index.html
diff --git a/...hadoop-0.20.0/webapps/job/WEB-INF/web.xml → ...hadoop-0.20.0/webapps/job/WEB-INF/web.xml b/...hadoop-0.20.0/webapps/job/WEB-INF/web.xml → ...hadoop-0.20.0/webapps/job/WEB-INF/web.xml
diff --git a/...arty/hadoop-0.20.0/webapps/job/index.html → lib/hadoop-0.20.0/webapps/job/index.html b/...arty/hadoop-0.20.0/webapps/job/index.html → lib/hadoop-0.20.0/webapps/job/index.html
diff --git a/...oop-0.20.0/webapps/static/hadoop-logo.jpg → ...oop-0.20.0/webapps/static/hadoop-logo.jpg b/...oop-0.20.0/webapps/static/hadoop-logo.jpg → ...oop-0.20.0/webapps/static/hadoop-logo.jpg
diff --git a/...y/hadoop-0.20.0/webapps/static/hadoop.css → lib/hadoop-0.20.0/webapps/static/hadoop.css b/...y/hadoop-0.20.0/webapps/static/hadoop.css → lib/hadoop-0.20.0/webapps/static/hadoop.css
diff --git a/.../hadoop-0.20.0/webapps/static/jobconf.xsl → lib/hadoop-0.20.0/webapps/static/jobconf.xsl b/.../hadoop-0.20.0/webapps/static/jobconf.xsl → lib/hadoop-0.20.0/webapps/static/jobconf.xsl
diff --git a/...adoop-0.20.0/webapps/static/jobtracker.js → ...adoop-0.20.0/webapps/static/jobtracker.js b/...adoop-0.20.0/webapps/static/jobtracker.js → ...adoop-0.20.0/webapps/static/jobtracker.js
diff --git a/...adoop-0.20.0/webapps/task/WEB-INF/web.xml → ...adoop-0.20.0/webapps/task/WEB-INF/web.xml b/...adoop-0.20.0/webapps/task/WEB-INF/web.xml → ...adoop-0.20.0/webapps/task/WEB-INF/web.xml
diff --git a/...rty/hadoop-0.20.0/webapps/task/index.html → lib/hadoop-0.20.0/webapps/task/index.html b/...rty/hadoop-0.20.0/webapps/task/index.html → lib/hadoop-0.20.0/webapps/task/index.html
diff --git a/...20100715/jetty-server-7.1.6.v20100715.jar → ...20100715/jetty-server-7.1.6.v20100715.jar b/...20100715/jetty-server-7.1.6.v20100715.jar → ...20100715/jetty-server-7.1.6.v20100715.jar
diff --git a/...jetty-7.1.6.v20100715/servlet-api-2.5.jar → ...jetty-7.1.6.v20100715/servlet-api-2.5.jar b/...jetty-7.1.6.v20100715/servlet-api-2.5.jar → ...jetty-7.1.6.v20100715/servlet-api-2.5.jar
diff --git a/lib/jline.jar b/lib/jline.jar
diff --git a/third_party/liblzf-3.5/Changes → lib/liblzf-3.5/Changes b/third_party/liblzf-3.5/Changes → lib/liblzf-3.5/Changes
diff --git a/third_party/liblzf-3.5/LICENSE → lib/liblzf-3.5/LICENSE b/third_party/liblzf-3.5/LICENSE → lib/liblzf-3.5/LICENSE
diff --git a/third_party/liblzf-3.5/Makefile → lib/liblzf-3.5/Makefile b/third_party/liblzf-3.5/Makefile → lib/liblzf-3.5/Makefile
diff --git a/third_party/liblzf-3.5/Makefile.in → lib/liblzf-3.5/Makefile.in b/third_party/liblzf-3.5/Makefile.in → lib/liblzf-3.5/Makefile.in
diff --git a/third_party/liblzf-3.5/README → lib/liblzf-3.5/README b/third_party/liblzf-3.5/README → lib/liblzf-3.5/README
diff --git a/third_party/liblzf-3.5/config.h → lib/liblzf-3.5/config.h b/third_party/liblzf-3.5/config.h → lib/liblzf-3.5/config.h
diff --git a/third_party/liblzf-3.5/config.h.in → lib/liblzf-3.5/config.h.in b/third_party/liblzf-3.5/config.h.in → lib/liblzf-3.5/config.h.in
diff --git a/third_party/liblzf-3.5/config.log → lib/liblzf-3.5/config.log b/third_party/liblzf-3.5/config.log → lib/liblzf-3.5/config.log
diff --git a/third_party/liblzf-3.5/config.status → lib/liblzf-3.5/config.status b/third_party/liblzf-3.5/config.status → lib/liblzf-3.5/config.status
diff --git a/third_party/liblzf-3.5/configure → lib/liblzf-3.5/configure b/third_party/liblzf-3.5/configure → lib/liblzf-3.5/configure
diff --git a/third_party/liblzf-3.5/configure.ac → lib/liblzf-3.5/configure.ac b/third_party/liblzf-3.5/configure.ac → lib/liblzf-3.5/configure.ac
diff --git a/third_party/liblzf-3.5/crc32.h → lib/liblzf-3.5/crc32.h b/third_party/liblzf-3.5/crc32.h → lib/liblzf-3.5/crc32.h
diff --git a/third_party/liblzf-3.5/cs/CLZF.cs → lib/liblzf-3.5/cs/CLZF.cs b/third_party/liblzf-3.5/cs/CLZF.cs → lib/liblzf-3.5/cs/CLZF.cs
diff --git a/third_party/liblzf-3.5/cs/README → lib/liblzf-3.5/cs/README b/third_party/liblzf-3.5/cs/README → lib/liblzf-3.5/cs/README
diff --git a/third_party/liblzf-3.5/install-sh → lib/liblzf-3.5/install-sh b/third_party/liblzf-3.5/install-sh → lib/liblzf-3.5/install-sh
diff --git a/third_party/liblzf-3.5/lzf.c → lib/liblzf-3.5/lzf.c b/third_party/liblzf-3.5/lzf.c → lib/liblzf-3.5/lzf.c
diff --git a/third_party/liblzf-3.5/lzf.h → lib/liblzf-3.5/lzf.h b/third_party/liblzf-3.5/lzf.h → lib/liblzf-3.5/lzf.h
diff --git a/third_party/liblzf-3.5/lzfP.h → lib/liblzf-3.5/lzfP.h b/third_party/liblzf-3.5/lzfP.h → lib/liblzf-3.5/lzfP.h
diff --git a/third_party/liblzf-3.5/lzf_c.c → lib/liblzf-3.5/lzf_c.c b/third_party/liblzf-3.5/lzf_c.c → lib/liblzf-3.5/lzf_c.c
diff --git a/third_party/liblzf-3.5/lzf_d.c → lib/liblzf-3.5/lzf_d.c b/third_party/liblzf-3.5/lzf_d.c → lib/liblzf-3.5/lzf_d.c
diff --git a/third_party/mesos.jar → lib/mesos.jar b/third_party/mesos.jar → lib/mesos.jar
diff --git a/third_party/scalacheck_2.8.0-1.7.jar → lib/scalacheck_2.8.0-1.7.jar b/third_party/scalacheck_2.8.0-1.7.jar → lib/scalacheck_2.8.0-1.7.jar
diff --git a/third_party/scalatest-1.2/LICENSE → lib/scalatest-1.2/LICENSE b/third_party/scalatest-1.2/LICENSE → lib/scalatest-1.2/LICENSE
diff --git a/third_party/scalatest-1.2/NOTICE → lib/scalatest-1.2/NOTICE b/third_party/scalatest-1.2/NOTICE → lib/scalatest-1.2/NOTICE
diff --git a/third_party/scalatest-1.2/README.txt → lib/scalatest-1.2/README.txt b/third_party/scalatest-1.2/README.txt → lib/scalatest-1.2/README.txt
diff --git a/third_party/scalatest-1.2/scalatest-1.2.jar → lib/scalatest-1.2/scalatest-1.2.jar b/third_party/scalatest-1.2/scalatest-1.2.jar → lib/scalatest-1.2/scalatest-1.2.jar
diff --git a/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar → lib/slf4j-1.6.1/slf4j-api-1.6.1.jar b/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar → lib/slf4j-1.6.1/slf4j-api-1.6.1.jar
diff --git a/...party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar → lib/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar b/...party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar → lib/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
diff --git a/project/build.properties b/project/build.properties
@@ -0,0 +1,8 @@
+#Project properties
+#Sat Nov 13 21:57:32 PST 2010
+project.organization=UC Berkeley
+project.name=Spark
+sbt.version=0.7.5.RC0
+project.version=0.0.0
+build.scala.versions=2.8.1
+project.initialize=false
diff --git a/run b/run
@@ -25,7 +25,7 @@ fi
 
 # Set JAVA_OPTS to be able to load native libraries and to set heap size
 JAVA_OPTS="$SPARK_JAVA_OPTS"
-JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH:$FWDIR/third_party:$FWDIR/src/native:$MESOS_LIBRARY_PATH"
+JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH:$FWDIR/lib:$FWDIR/src/native:$MESOS_LIBRARY_PATH"
 JAVA_OPTS+=" -Xms$SPARK_MEM -Xmx$SPARK_MEM"
 # Load extra JAVA_OPTS from conf/java-opts, if it exists
 if [ -e $FWDIR/conf/java-opts ] ; then
@@ -34,21 +34,21 @@ fi
 export JAVA_OPTS
 
 # build up classpath
-CLASSPATH="$SPARK_CLASSPATH:$FWDIR/target/classes:$FWDIR/target/test/classes:$MESOS_CLASSPATH"
+CLASSPATH="$SPARK_CLASSPATH:$FWDIR/target/scala_2.8.1/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
-CLASSPATH+=:$FWDIR/third_party/colt.jar
-CLASSPATH+=:$FWDIR/third_party/guava-r07/guava-r07.jar
-CLASSPATH+=:$FWDIR/third_party/hadoop-0.20.0/hadoop-0.20.0-core.jar
-CLASSPATH+=:$FWDIR/third_party/scalatest-1.2/scalatest-1.2.jar
-CLASSPATH+=:$FWDIR/third_party/scalacheck_2.8.0-1.7.jar
-CLASSPATH+=:$FWDIR/third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
-CLASSPATH+=:$FWDIR/third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar
-CLASSPATH+=:$FWDIR/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar
-CLASSPATH+=:$FWDIR/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar
-CLASSPATH+=:$FWDIR/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
+CLASSPATH+=:$FWDIR/lib/mesos.jar
+CLASSPATH+=:$FWDIR/lib/asm-3.2/lib/all/asm-all-3.2.jar
+CLASSPATH+=:$FWDIR/lib/colt.jar
+CLASSPATH+=:$FWDIR/lib/guava-r07/guava-r07.jar
+CLASSPATH+=:$FWDIR/lib/hadoop-0.20.0/hadoop-0.20.0-core.jar
+CLASSPATH+=:$FWDIR/lib/scalatest-1.2/scalatest-1.2.jar
+CLASSPATH+=:$FWDIR/lib/scalacheck_2.8.0-1.7.jar
+CLASSPATH+=:$FWDIR/lib/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar
+CLASSPATH+=:$FWDIR/lib/jetty-7.1.6.v20100715/servlet-api-2.5.jar
+CLASSPATH+=:$FWDIR/lib/apache-log4j-1.2.16/log4j-1.2.16.jar
+CLASSPATH+=:$FWDIR/lib/slf4j-1.6.1/slf4j-api-1.6.1.jar
+CLASSPATH+=:$FWDIR/lib/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar
+for jar in $FWDIR/lib/hadoop-0.20.0/lib/*.jar; do
   CLASSPATH+=:$jar
 done
 export CLASSPATH # Needed for spark-shell

diff --git a/sbt/sbt b/sbt/sbt
@@ -0,0 +1,2 @@
+#!/bin/bash
+java -Xmx512M -jar `dirname $0`/sbt-launch-*.jar "$@"
diff --git a/sbt/sbt-launch-0.7.5.RC0.jar b/sbt/sbt-launch-0.7.5.RC0.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		java -Xmx512M -jar `dirname $0`/sbt-launch-*.jar "$@"