Skip to content

Commit

Permalink
Merge remote branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjmcgrath
mjmcgrath committed Jun 21, 2011
2 parents 79fc7ba + d9ae9e6 commit f7a40ca
Show file tree
Hide file tree
Showing 310 changed files with 25,782 additions and 5,078 deletions.
76 changes: 60 additions & 16 deletions .classpath
View file
Expand Up @@ -3,26 +3,70 @@
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="src" path="src/dist"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/bzip2.jar"/>
<classpathentry kind="lib" path="lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="lib/ant-1.6.5.jar"/>
<classpathentry kind="lib" path="lib/bliki-core-3.0.16-javadoc.jar"/>
<classpathentry kind="lib" path="lib/bliki-core-3.0.16-sources.jar"/>
<classpathentry kind="lib" path="lib/bliki-core-3.0.16.jar"/>
<classpathentry kind="lib" path="lib/collections-generic-4.01-javadoc.jar"/>
<classpathentry kind="lib" path="lib/collections-generic-4.01-sources.jar"/>
<classpathentry kind="lib" path="lib/collections-generic-4.01.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/>
<classpathentry kind="lib" path="lib/junit-4.4.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.13.jar"/>
<classpathentry kind="lib" path="lib/memcached-2.2.jar"/>
<classpathentry kind="lib" path="lib/spy-2.4.jar"/>
<classpathentry kind="lib" path="lib/jung-algorithms-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jung-api-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jung-graph-impl-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/clojure-1.1.jar"/>
<classpathentry kind="lib" path="lib/colt-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/commons-cli-1.2-javadoc.jar"/>
<classpathentry kind="lib" path="lib/commons-cli-1.2-sources.jar"/>
<classpathentry kind="lib" path="lib/commons-cli-1.2.jar"/>
<classpathentry kind="lib" path="lib/hadoop-0.20.1-core.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.0.jar"/>
<classpathentry kind="lib" path="lib/commons-el-1.0.jar"/>
<classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6-javadoc.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6-sources.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-net-1.4.1.jar"/>
<classpathentry kind="lib" path="lib/concurrent-1.3.4.jar"/>
<classpathentry kind="lib" path="lib/core-3.1.1.jar"/>
<classpathentry kind="lib" path="lib/fastutil-5.1.5.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.0.jar"/>
<classpathentry kind="lib" path="lib/guava-r09-javadoc.jar"/>
<classpathentry kind="lib" path="lib/guava-r09-sources.jar"/>
<classpathentry kind="lib" path="lib/guava-r09.jar"/>
<classpathentry kind="lib" path="lib/hadoop-core-0.20.2-320.jar"/>
<classpathentry kind="lib" path="lib/hadoop-core-0.20.2.jar"/>
<classpathentry kind="lib" path="lib/hadoop-mrunit-0.20.2-320-sources.jar"/>
<classpathentry kind="lib" path="lib/hadoop-mrunit-0.20.2-320.jar"/>
<classpathentry kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
<classpathentry kind="lib" path="lib/htmlparser-1.6.jar"/>
<classpathentry kind="lib" path="lib/jasper-compiler-5.5.12.jar"/>
<classpathentry kind="lib" path="lib/jasper-runtime-5.5.12.jar"/>
<classpathentry kind="lib" path="lib/jets3t-0.7.1.jar"/>
<classpathentry kind="lib" path="lib/jetty-6.1.14.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-6.1.14.jar"/>
<classpathentry kind="lib" path="lib/jsp-2.1-6.1.14.jar"/>
<classpathentry kind="lib" path="lib/jsp-api-2.1-6.1.14.jar"/>
<classpathentry kind="lib" path="lib/jsr305-1.3.7.jar"/>
<classpathentry kind="lib" path="lib/jung-algorithms-2.0.1-sources.jar"/>
<classpathentry kind="lib" path="lib/jung-algorithms-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jung-api-2.0.1-sources.jar"/>
<classpathentry kind="lib" path="lib/jung-api-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jung-graph-impl-2.0.1-sources.jar"/>
<classpathentry kind="lib" path="lib/jung-graph-impl-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/junit-4.8.2-javadoc.jar"/>
<classpathentry kind="lib" path="lib/junit-4.8.2-sources.jar"/>
<classpathentry kind="lib" path="lib/junit-4.8.2.jar"/>
<classpathentry kind="lib" path="lib/kfs-0.3.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.16-javadoc.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.16-sources.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry kind="lib" path="lib/mail-1.4.1.jar"/>
<classpathentry kind="lib" path="lib/memcached-2.2.jar"/>
<classpathentry kind="lib" path="lib/mockito-all-1.8.5-sources.jar"/>
<classpathentry kind="lib" path="lib/mockito-all-1.8.5.jar"/>
<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/pcj-1.2.jar"/>
<classpathentry kind="lib" path="lib/servlet-api-2.5-6.1.14.jar"/>
<classpathentry kind="lib" path="lib/bliki-core-3.0.15.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.5.jar"/>
<classpathentry kind="lib" path="lib/guava-r07.jar"/>
<classpathentry kind="lib" path="lib/fastutil-5.1.5.jar"/>
<classpathentry kind="lib" path="lib/hadoop-mrunit-0.20.2-320.jar"/>
<classpathentry kind="lib" path="lib/spy-2.4.jar"/>
<classpathentry kind="lib" path="lib/xmlenc-0.52.jar"/>
<classpathentry kind="lib" path="lib/hadoop-streaming-0.20.2.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
10 changes: 6 additions & 4 deletions .gitignore
View file
@@ -1,12 +1,14 @@
build
cloud9.jar
/build/
/dist/
/lib/
ivy/ivy.jar
etc/junit.*
etc/run.*
docs/api
docs/regression-results
data/bible+shakes.nopunc
data/bible+shakes.nopunc.json.packed
data/bible+shakes.nopunc.tuple1.packed
data/bible+shakes.nopunc.tuple2.packed
test/*
pom.xml.asc
*~

0 comments on commit f7a40ca

Please sign in to comment.