Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge master into crawlexpert-post
  • Loading branch information
Jens Bertram committed Oct 9, 2013
2 parents 6e33be4 + 1b61bd4 commit 9f6b98d
Show file tree
Hide file tree
Showing 42 changed files with 27,020 additions and 160 deletions.
34 changes: 17 additions & 17 deletions .classpath
Expand Up @@ -50,27 +50,27 @@
<classpathentry kind="lib" path="lib/httpmime-4.3.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.5.jar"/>
<classpathentry kind="lib" path="lib/metadata-extractor-2.6.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.4.0.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.8.2.jar"/>
<classpathentry kind="lib" path="lib/jempbox-1.8.2.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.8.2.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-classification-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-core-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-facet-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-grouping-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-highlighter-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-join-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-memory-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-misc-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queries-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-queryparser-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-spatial-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/lucene-suggest-4.5.0.jar"/>
<classpathentry kind="lib" path="lib/solr-core-4.5.0.jar" sourcepath="/Volumes/Tres/noBackup/Downloads/solr-4.5.0/solr/core/src/java"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.5.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
<classpathentry kind="lib" path="lib/htmllexer.jar"/>
Expand Down
34 changes: 17 additions & 17 deletions addon/YaCy.app/Contents/Info.plist
Expand Up @@ -68,21 +68,21 @@
<string>$JAVAROOT/lib/jsch-0.1.42.jar</string>
<string>$JAVAROOT/lib/json-simple-1.1.jar</string>
<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-codecs-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-facet-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-join-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.4.0.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-common-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-classification-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-codecs-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-core-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-facet-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-grouping-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-highlighter-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-join-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-memory-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-misc-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-queries-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-queryparser-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-spatial-4.5.0.jar</string>
<string>$JAVAROOT/lib/lucene-suggest-4.5.0.jar</string>
<string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string>
<string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string>
<string>$JAVAROOT/lib/noggit-0.5.jar</string>
Expand All @@ -93,8 +93,8 @@
<string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string>
<string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string>
<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
<string>$JAVAROOT/lib/solr-core-4.4.0.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.4.0.jar</string>
<string>$JAVAROOT/lib/solr-core-4.5.0.jar</string>
<string>$JAVAROOT/lib/solr-solrj-4.5.0.jar</string>
<string>$JAVAROOT/lib/spatial4j-0.3.jar</string>
<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>
Expand Down

0 comments on commit 9f6b98d

Please sign in to comment.