You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2012/08/18 03:47:41 UTC
svn commit: r1374501 - in /lucene/dev/trunk: dev-tools/eclipse/ solr/
solr/contrib/extraction/
solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/
solr/licenses/
Author: janhoy
Date: Sat Aug 18 01:47:40 2012
New Revision: 1374501
URL: http://svn.apache.org/viewvc?rev=1374501&view=rev
Log:
SOLR-3707: Upgrade Solr to Tika 1.2
Added:
lucene/dev/trunk/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1
lucene/dev/trunk/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1
lucene/dev/trunk/solr/licenses/commons-compress-1.4.1.jar.sha1
lucene/dev/trunk/solr/licenses/fontbox-1.7.0.jar.sha1
lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-1.jar.sha1
lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-LICENSE-ASL.txt
- copied unchanged from r1369178, lucene/dev/trunk/solr/licenses/isoparser-LICENSE-ASL.txt
lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-NOTICE.txt
- copied, changed from r1369178, lucene/dev/trunk/solr/licenses/isoparser-NOTICE.txt
lucene/dev/trunk/solr/licenses/jempbox-1.7.0.jar.sha1
lucene/dev/trunk/solr/licenses/juniversalchardet-1.0.3.jar.sha1
lucene/dev/trunk/solr/licenses/juniversalchardet-LICENSE-MPL.txt (with props)
lucene/dev/trunk/solr/licenses/juniversalchardet-NOTICE.txt (with props)
lucene/dev/trunk/solr/licenses/pdfbox-1.7.0.jar.sha1
lucene/dev/trunk/solr/licenses/poi-3.8.jar.sha1
lucene/dev/trunk/solr/licenses/poi-ooxml-3.8.jar.sha1
lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1
lucene/dev/trunk/solr/licenses/poi-scratchpad-3.8.jar.sha1
lucene/dev/trunk/solr/licenses/tika-core-1.2.jar.sha1
lucene/dev/trunk/solr/licenses/tika-parsers-1.2.jar.sha1
lucene/dev/trunk/solr/licenses/xz-1.0.jar.sha1
lucene/dev/trunk/solr/licenses/xz-LICENSE-PD.txt (with props)
lucene/dev/trunk/solr/licenses/xz-NOTICE.txt (with props)
Removed:
lucene/dev/trunk/solr/licenses/apache-mime4j-core-0.7.jar.sha1
lucene/dev/trunk/solr/licenses/apache-mime4j-dom-0.7.jar.sha1
lucene/dev/trunk/solr/licenses/commons-compress-1.3.jar.sha1
lucene/dev/trunk/solr/licenses/fontbox-1.6.0.jar.sha1
lucene/dev/trunk/solr/licenses/isoparser-1.0-beta-5.jar.sha1
lucene/dev/trunk/solr/licenses/isoparser-LICENSE-ASL.txt
lucene/dev/trunk/solr/licenses/isoparser-NOTICE.txt
lucene/dev/trunk/solr/licenses/javassist-3.6.0.GA.jar.sha1
lucene/dev/trunk/solr/licenses/jempbox-1.6.0.jar.sha1
lucene/dev/trunk/solr/licenses/pdfbox-1.6.0.jar.sha1
lucene/dev/trunk/solr/licenses/poi-3.8-beta5.jar.sha1
lucene/dev/trunk/solr/licenses/poi-ooxml-3.8-beta5.jar.sha1
lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.8-beta5.jar.sha1
lucene/dev/trunk/solr/licenses/poi-scratchpad-3.8-beta5.jar.sha1
lucene/dev/trunk/solr/licenses/scannotation-1.0.2.jar.sha1
lucene/dev/trunk/solr/licenses/tika-core-1.1.jar.sha1
lucene/dev/trunk/solr/licenses/tika-parsers-1.1.jar.sha1
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/NOTICE.txt
lucene/dev/trunk/solr/contrib/extraction/ivy.xml
lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
lucene/dev/trunk/solr/licenses/commons-compress-NOTICE.txt
lucene/dev/trunk/solr/licenses/fontbox-NOTICE.txt
lucene/dev/trunk/solr/licenses/jempbox-NOTICE.txt
lucene/dev/trunk/solr/licenses/pdfbox-NOTICE.txt
lucene/dev/trunk/solr/licenses/tika-core-NOTICE.txt
lucene/dev/trunk/solr/licenses/tika-parsers-NOTICE.txt
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Sat Aug 18 01:47:40 2012
@@ -1,126 +1,126 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="lucene/core/src/java"/>
- <classpathentry kind="src" path="lucene/core/src/resources"/>
- <classpathentry kind="src" path="lucene/core/src/test"/>
- <classpathentry kind="src" path="lucene/demo/src/java"/>
- <classpathentry kind="src" path="lucene/demo/src/resources"/>
- <classpathentry kind="src" path="lucene/demo/src/test"/>
- <classpathentry kind="src" path="lucene/highlighter/src/java"/>
- <classpathentry kind="src" path="lucene/highlighter/src/test"/>
- <classpathentry kind="src" path="lucene/memory/src/java"/>
- <classpathentry kind="src" path="lucene/memory/src/test"/>
- <classpathentry kind="src" path="lucene/misc/src/java"/>
- <classpathentry kind="src" path="lucene/misc/src/test"/>
- <classpathentry kind="src" path="lucene/sandbox/src/java"/>
- <classpathentry kind="src" path="lucene/sandbox/src/test"/>
- <classpathentry kind="src" path="lucene/test-framework/src/java"/>
+ <classpathentry kind="src" path="lucene/core/src/java"/>
+ <classpathentry kind="src" path="lucene/core/src/resources"/>
+ <classpathentry kind="src" path="lucene/core/src/test"/>
+ <classpathentry kind="src" path="lucene/demo/src/java"/>
+ <classpathentry kind="src" path="lucene/demo/src/resources"/>
+ <classpathentry kind="src" path="lucene/demo/src/test"/>
+ <classpathentry kind="src" path="lucene/highlighter/src/java"/>
+ <classpathentry kind="src" path="lucene/highlighter/src/test"/>
+ <classpathentry kind="src" path="lucene/memory/src/java"/>
+ <classpathentry kind="src" path="lucene/memory/src/test"/>
+ <classpathentry kind="src" path="lucene/misc/src/java"/>
+ <classpathentry kind="src" path="lucene/misc/src/test"/>
+ <classpathentry kind="src" path="lucene/sandbox/src/java"/>
+ <classpathentry kind="src" path="lucene/sandbox/src/test"/>
+ <classpathentry kind="src" path="lucene/test-framework/src/java"/>
<classpathentry kind="src" output="bin/tests-framework" path="lucene/test-framework/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/common/src/java"/>
- <classpathentry kind="src" output="bin/analysis-common" path="lucene/analysis/common/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/common/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/icu/src/java"/>
- <classpathentry kind="src" output="bin/analysis-icu" path="lucene/analysis/icu/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/icu/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/kuromoji/src/java"/>
- <classpathentry kind="src" output="bin/analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/kuromoji/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/phonetic/src/java"/>
- <classpathentry kind="src" output="bin/analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/phonetic/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/smartcn/src/java"/>
- <classpathentry kind="src" output="bin/analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/smartcn/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/stempel/src/java"/>
- <classpathentry kind="src" output="bin/analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/stempel/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/morfologik/src/java"/>
- <classpathentry kind="src" output="bin/analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/morfologik/src/test"/>
- <classpathentry kind="src" path="lucene/analysis/uima/src/java"/>
- <classpathentry kind="src" output="bin/analysis-uima" path="lucene/analysis/uima/src/resources"/>
- <classpathentry kind="src" path="lucene/analysis/uima/src/test"/>
- <classpathentry kind="src" path="lucene/benchmark/src/java"/>
- <classpathentry kind="src" path="lucene/benchmark/src/test"/>
- <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
- <classpathentry kind="src" path="lucene/facet/src/java"/>
- <classpathentry kind="src" path="lucene/facet/src/examples"/>
- <classpathentry kind="src" path="lucene/facet/src/test"/>
- <classpathentry kind="src" path="lucene/grouping/src/java"/>
- <classpathentry kind="src" path="lucene/grouping/src/test"/>
- <classpathentry kind="src" path="lucene/join/src/java"/>
- <classpathentry kind="src" path="lucene/join/src/test"/>
- <classpathentry kind="src" path="lucene/queries/src/java"/>
- <classpathentry kind="src" path="lucene/queries/src/test"/>
- <classpathentry kind="src" path="lucene/queryparser/src/java"/>
- <classpathentry kind="src" path="lucene/queryparser/src/resources"/>
- <classpathentry kind="src" path="lucene/queryparser/src/test"/>
- <classpathentry kind="src" path="lucene/suggest/src/java"/>
- <classpathentry kind="src" path="lucene/suggest/src/test"/>
- <classpathentry kind="src" path="lucene/spatial/src/java"/>
- <classpathentry kind="src" path="lucene/spatial/src/test"/>
- <classpathentry kind="src" path="lucene/spatial/src/test-files"/>
- <classpathentry kind="lib" path="lucene/spatial/lib/spatial4j-0.2.jar"/>
- <classpathentry kind="src" path="solr/core/src/java"/>
- <classpathentry kind="src" path="solr/core/src/test"/>
- <classpathentry kind="src" path="solr/core/src/test-files"/>
- <classpathentry kind="src" path="solr/solrj/src/java"/>
- <classpathentry kind="src" path="solr/solrj/src/test"/>
- <classpathentry kind="src" path="solr/solrj/src/test-files"/>
- <classpathentry kind="src" path="solr/test-framework/src/java"/>
- <classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
- <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test"/>
- <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/clustering/src/java"/>
- <classpathentry kind="src" path="solr/contrib/clustering/src/test"/>
- <classpathentry kind="src" path="solr/contrib/clustering/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/java"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/java"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test"/>
- <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/extraction/src/java"/>
- <classpathentry kind="src" path="solr/contrib/extraction/src/test"/>
- <classpathentry kind="src" path="solr/contrib/extraction/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/java"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/resources"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/test"/>
- <classpathentry kind="src" path="solr/contrib/langid/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/uima/src/java"/>
- <classpathentry kind="src" path="solr/contrib/uima/src/resources"/>
- <classpathentry kind="src" path="solr/contrib/uima/src/test"/>
- <classpathentry kind="src" path="solr/contrib/uima/src/test-files"/>
- <classpathentry kind="src" path="solr/contrib/velocity/src/java"/>
- <classpathentry kind="src" path="solr/contrib/velocity/src/test"/>
- <classpathentry kind="src" path="solr/contrib/velocity/src/test-files"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/ant-1.8.2.jar"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.8.2.jar"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
- <classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
- <classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.3.jar"/>
- <classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-cli-1.2.jar"/>
- <classpathentry kind="lib" path="solr/lib/httpclient-4.1.3.jar"/>
- <classpathentry kind="lib" path="solr/lib/httpcore-4.1.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/httpmime-4.1.3.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-io-2.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
- <classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
- <classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
- <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
- <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.6.jar"/>
+ <classpathentry kind="src" path="lucene/analysis/common/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-common" path="lucene/analysis/common/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/common/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/icu/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-icu" path="lucene/analysis/icu/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/icu/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/kuromoji/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/kuromoji/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/phonetic/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/phonetic/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/smartcn/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/smartcn/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/stempel/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/stempel/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/morfologik/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/morfologik/src/test"/>
+ <classpathentry kind="src" path="lucene/analysis/uima/src/java"/>
+ <classpathentry kind="src" output="bin/analysis-uima" path="lucene/analysis/uima/src/resources"/>
+ <classpathentry kind="src" path="lucene/analysis/uima/src/test"/>
+ <classpathentry kind="src" path="lucene/benchmark/src/java"/>
+ <classpathentry kind="src" path="lucene/benchmark/src/test"/>
+ <classpathentry excluding="src" including="conf/**" kind="src" path="lucene/benchmark"/>
+ <classpathentry kind="src" path="lucene/facet/src/java"/>
+ <classpathentry kind="src" path="lucene/facet/src/examples"/>
+ <classpathentry kind="src" path="lucene/facet/src/test"/>
+ <classpathentry kind="src" path="lucene/grouping/src/java"/>
+ <classpathentry kind="src" path="lucene/grouping/src/test"/>
+ <classpathentry kind="src" path="lucene/join/src/java"/>
+ <classpathentry kind="src" path="lucene/join/src/test"/>
+ <classpathentry kind="src" path="lucene/queries/src/java"/>
+ <classpathentry kind="src" path="lucene/queries/src/test"/>
+ <classpathentry kind="src" path="lucene/queryparser/src/java"/>
+ <classpathentry kind="src" path="lucene/queryparser/src/resources"/>
+ <classpathentry kind="src" path="lucene/queryparser/src/test"/>
+ <classpathentry kind="src" path="lucene/suggest/src/java"/>
+ <classpathentry kind="src" path="lucene/suggest/src/test"/>
+ <classpathentry kind="src" path="lucene/spatial/src/java"/>
+ <classpathentry kind="src" path="lucene/spatial/src/test"/>
+ <classpathentry kind="src" path="lucene/spatial/src/test-files"/>
+ <classpathentry kind="lib" path="lucene/spatial/lib/spatial4j-0.2.jar"/>
+ <classpathentry kind="src" path="solr/core/src/java"/>
+ <classpathentry kind="src" path="solr/core/src/test"/>
+ <classpathentry kind="src" path="solr/core/src/test-files"/>
+ <classpathentry kind="src" path="solr/solrj/src/java"/>
+ <classpathentry kind="src" path="solr/solrj/src/test"/>
+ <classpathentry kind="src" path="solr/solrj/src/test-files"/>
+ <classpathentry kind="src" path="solr/test-framework/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/analysis-extras/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/analysis-extras/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/clustering/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/clustering/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/clustering/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/dataimporthandler-extras/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/extraction/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/extraction/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/extraction/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/resources"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/langid/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/resources"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/uima/src/test-files"/>
+ <classpathentry kind="src" path="solr/contrib/velocity/src/java"/>
+ <classpathentry kind="src" path="solr/contrib/velocity/src/test"/>
+ <classpathentry kind="src" path="solr/contrib/velocity/src/test-files"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/ant-1.8.2.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/ant-junit-1.8.2.jar"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
+ <classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.3.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-cli-1.2.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpclient-4.1.3.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpcore-4.1.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpmime-4.1.3.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-io-2.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
+ <classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
+ <classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
+ <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
+ <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.6.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.2.v20120308.jar"/>
@@ -133,47 +133,57 @@
<classpathentry kind="lib" path="solr/example/lib/jetty-webapp-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-xml-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/servlet-api-3.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-compress-1.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.6.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.6.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/netcdf-4.2-min.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/pdfbox-1.6.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-3.8-beta5.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-3.8-beta5.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-schemas-3.8-beta5.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-scratchpad-3.8-beta5.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/rome-0.9.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/tagsoup-1.2.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-1.1-20120112.jar"/>
- <classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/Tagger-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
- <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-1.6.4.jar"/>
- <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-tools-2.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-core-asl-1.7.4.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.7.4.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcmail-jdk15-1.45.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/bcprov-jdk15-1.45.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/boilerpipe-1.1.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/metadata-extractor-2.4.0-beta-1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/netcdf-4.2-min.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/rome-0.9.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/tagsoup-1.2.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/langid/lib/langdetect-1.1-20120112.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/langid/lib/jsonic-1.2.7.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/Tagger-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/WhitespaceTokenizer-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-tools-2.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
- <classpathentry kind="output" path="bin/other"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-compress-1.4.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.7.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/icu4j-49.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/isoparser-1.0-RC-1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/jdom-1.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/jempbox-1.7.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/juniversalchardet-1.0.3.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/pdfbox-1.7.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-3.8.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-3.8.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-ooxml-schemas-3.8.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/poi-scratchpad-3.8.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-core-1.2.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-1.2.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/vorbis-java-core-0.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/vorbis-java-tika-0.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/extraction/lib/xz-1.0.jar"/>
+ <classpathentry kind="output" path="bin/other"/>
</classpath>
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Aug 18 01:47:40 2012
@@ -26,6 +26,14 @@ $Id$
================== 4.0.0 ==================
+Versions of Major Components
+---------------------
+Apache Tika 1.2
+Carrot2 3.5.0
+Velocity 1.6.4 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.3.6
+
Upgrading from Solr 4.0.0-BETA
----------------------
@@ -82,6 +90,7 @@ Other Changes
* SOLR-3691: SimplePostTool: Mode for crawling/posting web pages
See http://wiki.apache.org/solr/ExtractingRequestHandler for examples (janhoy)
+* SOLR-3707: Upgrade Solr to Tika 1.2 (janhoy)
================== 4.0.0-BETA ===================
@@ -291,7 +300,6 @@ Other Changes
Also, the configuration itself can be passed using the "dataConfig" parameter rather than
using a file (this previously worked in debug mode only). When configuration errors are
encountered, the error message is returned in XML format. (James Dyer)
-
* SOLR-3439: Make SolrCell easier to use out of the box. Also improves "/browse" to display
rich-text documents correctly, along with facets for author and content_type.
With the new "content" field, highlighting of body is supported. See also SOLR-3672 for
Modified: lucene/dev/trunk/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/NOTICE.txt?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/NOTICE.txt (original)
+++ lucene/dev/trunk/solr/NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -310,12 +310,11 @@ Copyright 2004 Sun Microsystems, Inc. (R
Copyright 2002-2008 by John Cowan (TagSoup -- http://ccil.org/~cowan/XML/tagsoup/)
-Copyright (C) 1999-2007 Shigeru Chiba. All Rights Reserved.
-(Javassist, MPL licensed: http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/)
-
Copyright (C) 1994-2007 by the Xiph.org Foundation, http://www.xiph.org/ (OggVorbis)
-Scannotation (C) Bill Burke
+Copyright 2012 Kohei Taketa juniversalchardet (http://code.google.com/p/juniversalchardet/)
+
+Lasse Collin and others, XZ for Java (http://tukaani.org/xz/java.html)
=========================================================================
== Language Detection Notices ==
Modified: lucene/dev/trunk/solr/contrib/extraction/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/ivy.xml?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/ivy.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/ivy.xml Sat Aug 18 01:47:40 2012
@@ -20,36 +20,36 @@
<info organisation="org.apache.solr" module="extraction"/>
<dependencies>
<!-- Tika JARs -->
- <dependency org="org.apache.tika" name="tika-core" rev="1.1" transitive="false"/>
- <dependency org="org.apache.tika" name="tika-parsers" rev="1.1" transitive="false"/>
- <!-- Tika dependencies - see http://tika.apache.org/1.1/gettingstarted.html#Using_Tika_as_a_Maven_dependency -->
+ <dependency org="org.apache.tika" name="tika-core" rev="1.2" transitive="false"/>
+ <dependency org="org.apache.tika" name="tika-parsers" rev="1.2" transitive="false"/>
+ <!-- Tika dependencies - see http://tika.apache.org/1.2/gettingstarted.html#Using_Tika_as_a_Maven_dependency -->
<!-- When upgrading Tika, upgrade dependencies versions and add any new ones
(except slf4j-api, commons-codec, commons-logging, geronimo-stax-api_1.0_spec) -->
<dependency org="org.gagravarr" name="vorbis-java-tika" rev="0.1" transitive="false"/>
<dependency org="org.gagravarr" name="vorbis-java-core" rev="0.1" transitive="false"/>
<dependency org="edu.ucar" name="netcdf" rev="4.2-min" transitive="false"/>
- <dependency org="org.apache.james" name="apache-mime4j-core" rev="0.7" transitive="false"/>
- <dependency org="org.apache.james" name="apache-mime4j-dom" rev="0.7" transitive="false"/>
- <dependency org="org.apache.commons" name="commons-compress" rev="1.3" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="pdfbox" rev="1.6.0" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="fontbox" rev="1.6.0" transitive="false"/>
- <dependency org="org.apache.pdfbox" name="jempbox" rev="1.6.0" transitive="false"/>
+ <dependency org="org.apache.james" name="apache-mime4j-core" rev="0.7.2" transitive="false"/>
+ <dependency org="org.apache.james" name="apache-mime4j-dom" rev="0.7.2" transitive="false"/>
+ <dependency org="org.apache.commons" name="commons-compress" rev="1.4.1" transitive="false"/>
+ <dependency org="org.apache.pdfbox" name="pdfbox" rev="1.7.0" transitive="false"/>
+ <dependency org="org.apache.pdfbox" name="fontbox" rev="1.7.0" transitive="false"/>
+ <dependency org="org.apache.pdfbox" name="jempbox" rev="1.7.0" transitive="false"/>
<dependency org="org.bouncycastle" name="bcmail-jdk15" rev="1.45" transitive="false"/>
<dependency org="org.bouncycastle" name="bcprov-jdk15" rev="1.45" transitive="false"/>
- <dependency org="org.apache.poi" name="poi" rev="3.8-beta5" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-scratchpad" rev="3.8-beta5" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-ooxml" rev="3.8-beta5" transitive="false"/>
- <dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="3.8-beta5" transitive="false"/>
+ <dependency org="org.apache.poi" name="poi" rev="3.8" transitive="false"/>
+ <dependency org="org.apache.poi" name="poi-scratchpad" rev="3.8" transitive="false"/>
+ <dependency org="org.apache.poi" name="poi-ooxml" rev="3.8" transitive="false"/>
+ <dependency org="org.apache.poi" name="poi-ooxml-schemas" rev="3.8" transitive="false"/>
<dependency org="org.apache.xmlbeans" name="xmlbeans" rev="2.3.0" transitive="false"/>
<dependency org="dom4j" name="dom4j" rev="1.6.1" transitive="false"/>
<dependency org="org.ccil.cowan.tagsoup" name="tagsoup" rev="1.2.1" transitive="false"/>
- <dependency org="com.googlecode.mp4parser" name="isoparser" rev="1.0-beta-5" transitive="false"/>
- <dependency org="net.sf.scannotation" name="scannotation" rev="1.0.2" transitive="false"/>
- <dependency org="javassist" name="javassist" rev="3.6.0.GA" transitive="false"/>
+ <dependency org="com.googlecode.mp4parser" name="isoparser" rev="1.0-RC-1" transitive="false"/>
<dependency org="com.drewnoakes" name="metadata-extractor" rev="2.4.0-beta-1" transitive="false"/>
<dependency org="de.l3s.boilerpipe" name="boilerpipe" rev="1.1.0" transitive="false"/>
<dependency org="rome" name="rome" rev="0.9" transitive="false"/>
<dependency org="jdom" name="jdom" rev="1.0" transitive="false"/>
+ <dependency org="com.googlecode.juniversalchardet" name="juniversalchardet" rev="1.0.3" transitive="false"/>
+ <dependency org="org.tukaani" name="xz" rev="1.0" transitive="false"/>
<!-- Other ExtracingRequestHandler dependencies -->
<dependency org="com.ibm.icu" name="icu4j" rev="49.1" transitive="false"/>
<dependency org="xerces" name="xercesImpl" rev="2.9.1" transitive="false"/>
Modified: lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java Sat Aug 18 01:47:40 2012
@@ -64,8 +64,7 @@ public class ExtractingRequestHandlerTes
"fmap.producer", "extractedProducer",
"fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
"fmap.Creation-Date", "extractedDate",
- "fmap.AAPL:Keywords", "ignored_a",
- "fmap.xmpTPg:NPages", "ignored_a",
+ "uprefix", "ignored_",
"fmap.Author", "extractedAuthor",
"fmap.content", "extractedContent",
"literal.id", "one",
@@ -81,6 +80,7 @@ public class ExtractingRequestHandlerTes
"fmap.Author", "extractedAuthor",
"fmap.language", "extractedLanguage",
"literal.id", "two",
+ "uprefix", "ignored_",
"fmap.content", "extractedContent",
"fmap.Last-Modified", "extractedDate"
);
@@ -136,6 +136,7 @@ public class ExtractingRequestHandlerTes
"fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
"fmap.Author", "extractedAuthor",
"literal.id", "three",
+ "uprefix", "ignored_",
"fmap.content", "extractedContent",
"fmap.language", "extractedLanguage",
"fmap.Last-Modified", "extractedDate"
@@ -206,6 +207,7 @@ public class ExtractingRequestHandlerTes
"fmap.Author", "extractedAuthor",
"fmap.content", "extractedContent",
"literal.id", "one",
+ "uprefix", "ignored_",
"fmap.language", "extractedLanguage",
"literal.extractionLiteralMV", "one",
"literal.extractionLiteralMV", "two",
@@ -374,9 +376,8 @@ public class ExtractingRequestHandlerTes
loadLocal("extraction/arabic.pdf", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
"fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
"fmap.Creation-Date", "extractedDate",
- "fmap.AAPL:Keywords", "ignored_a",
- "fmap.xmpTPg:NPages", "ignored_a",
"fmap.Author", "extractedAuthor",
+ "uprefix", "ignored_",
"fmap.content", "wdf_nocase",
"literal.id", "one",
"fmap.Last-Modified", "extractedDate");
@@ -404,8 +405,7 @@ public class ExtractingRequestHandlerTes
loadLocal("extraction/password-is-solrcell.docx", "fmap.created", "extractedDate", "fmap.producer", "extractedProducer",
"fmap.creator", "extractedCreator", "fmap.Keywords", "extractedKeywords",
"fmap.Creation-Date", "extractedDate",
- "fmap.AAPL:Keywords", "ignored_a",
- "fmap.xmpTPg:NPages", "ignored_a",
+ "uprefix", "ignored_",
"fmap.Author", "extractedAuthor",
"fmap.content", "wdf_nocase",
"literal.id", "one",
@@ -462,8 +462,7 @@ public class ExtractingRequestHandlerTes
"fmap.content", "extractedContent",
"fmap.language", "extractedLanguage",
"fmap.Creation-Date", "extractedDate",
- "fmap.AAPL:Keywords", "ignored_a",
- "fmap.xmpTPg:NPages", "ignored_a",
+ "uprefix", "ignored_",
"fmap.Last-Modified", "extractedDate");
// Here the literal value should override the Tika-parsed title:
@@ -478,8 +477,7 @@ public class ExtractingRequestHandlerTes
"fmap.content", "extractedContent",
"fmap.language", "extractedLanguage",
"fmap.Creation-Date", "extractedDate",
- "fmap.AAPL:Keywords", "ignored_a",
- "fmap.xmpTPg:NPages", "ignored_a",
+ "uprefix", "ignored_",
"fmap.Last-Modified", "extractedDate");
// Here we mimic the old behaviour where literals are added, not overridden
@@ -498,8 +496,7 @@ public class ExtractingRequestHandlerTes
"fmap.content", "extractedContent",
"fmap.language", "extractedLanguage",
"fmap.Creation-Date", "extractedDate",
- "fmap.AAPL:Keywords", "ignored_a",
- "fmap.xmpTPg:NPages", "ignored_a",
+ "uprefix", "ignored_",
"fmap.Last-Modified", "extractedDate");
assertU(commit());
Added: lucene/dev/trunk/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/apache-mime4j-core-0.7.2.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+a81264fe0265ebe8fd1d8128aad06dc320de6eef
Added: lucene/dev/trunk/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/apache-mime4j-dom-0.7.2.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+1c289aa264548a0a1f1b43685a9cb2ab23f67287
Added: lucene/dev/trunk/solr/licenses/commons-compress-1.4.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/commons-compress-1.4.1.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/commons-compress-1.4.1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/commons-compress-1.4.1.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+b02e84a993d88568417536240e970c4b809126fd
Modified: lucene/dev/trunk/solr/licenses/commons-compress-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/commons-compress-NOTICE.txt?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/licenses/commons-compress-NOTICE.txt (original)
+++ lucene/dev/trunk/solr/licenses/commons-compress-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -1,5 +1,5 @@
Apache Commons Compress
-Copyright 2002-2011 The Apache Software Foundation
+Copyright 2002-2012 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Added: lucene/dev/trunk/solr/licenses/fontbox-1.7.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/fontbox-1.7.0.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/fontbox-1.7.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/fontbox-1.7.0.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+a37220d35b0c673a9543b4853152b57fb77ac513
Modified: lucene/dev/trunk/solr/licenses/fontbox-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/fontbox-NOTICE.txt?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/licenses/fontbox-NOTICE.txt (original)
+++ lucene/dev/trunk/solr/licenses/fontbox-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -1,6 +1,6 @@
Apache FontBox
-Copyright 2008-2010 The Apache Software Foundation
+Copyright 2008-2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Added: lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-1.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-1.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+4a5768b1070b9488a433362d736720fd7a7b264f
Copied: lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-NOTICE.txt (from r1369178, lucene/dev/trunk/solr/licenses/isoparser-NOTICE.txt)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-NOTICE.txt?p2=lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-NOTICE.txt&p1=lucene/dev/trunk/solr/licenses/isoparser-NOTICE.txt&r1=1369178&r2=1374501&rev=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/licenses/isoparser-NOTICE.txt (original)
+++ lucene/dev/trunk/solr/licenses/isoparser-1.0-RC-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -19,8 +19,5 @@ The Apache Software Foundation (http://w
This product includes software (Hex Encoder extracted from commons-codec) developed by
The Apache Software Foundation (http://www.apache.org/).
-This product includes software (JHexEditor) developed by
-Germán Laullón (http://www.apache.org/).
-
This product includes software (package com.googlecode.mp4parser.h264) developed by
-Stanislav Vitvitskiy and originally licensed under MIT license (http://www.opensource.org/licenses/mit-license.php)
+Stanislav Vitvitskiy and originally licensed under MIT license (http://www.opensource.org/licenses/mit-license.php)
\ No newline at end of file
Added: lucene/dev/trunk/solr/licenses/jempbox-1.7.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jempbox-1.7.0.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/jempbox-1.7.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/jempbox-1.7.0.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+d2f3d15fa0182e16e7f04fd37d2003dbd22d3e37
Modified: lucene/dev/trunk/solr/licenses/jempbox-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/jempbox-NOTICE.txt?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/licenses/jempbox-NOTICE.txt (original)
+++ lucene/dev/trunk/solr/licenses/jempbox-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -1,6 +1,6 @@
Apache JempBox
-Copyright 2008-2010 The Apache Software Foundation
+Copyright 2008-2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Added: lucene/dev/trunk/solr/licenses/juniversalchardet-1.0.3.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/juniversalchardet-1.0.3.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/juniversalchardet-1.0.3.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/juniversalchardet-1.0.3.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+cd49678784c46aa8789c060538e0154013bb421b
Added: lucene/dev/trunk/solr/licenses/juniversalchardet-LICENSE-MPL.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/juniversalchardet-LICENSE-MPL.txt?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/juniversalchardet-LICENSE-MPL.txt (added)
+++ lucene/dev/trunk/solr/licenses/juniversalchardet-LICENSE-MPL.txt Sat Aug 18 01:47:40 2012
@@ -0,0 +1,469 @@
+ MOZILLA PUBLIC LICENSE
+ Version 1.1
+
+ ---------------
+
+1. Definitions.
+
+ 1.0.1. "Commercial Use" means distribution or otherwise making the
+ Covered Code available to a third party.
+
+ 1.1. "Contributor" means each entity that creates or contributes to
+ the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original
+ Code, prior Modifications used by a Contributor, and the Modifications
+ made by that particular Contributor.
+
+ 1.3. "Covered Code" means the Original Code or Modifications or the
+ combination of the Original Code and Modifications, in each case
+ including portions thereof.
+
+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
+ accepted in the software development community for the electronic
+ transfer of data.
+
+ 1.5. "Executable" means Covered Code in any form other than Source
+ Code.
+
+ 1.6. "Initial Developer" means the individual or entity identified
+ as the Initial Developer in the Source Code notice required by Exhibit
+ A.
+
+ 1.7. "Larger Work" means a work which combines Covered Code or
+ portions thereof with code not governed by the terms of this License.
+
+ 1.8. "License" means this document.
+
+ 1.8.1. "Licensable" means having the right to grant, to the maximum
+ extent possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed herein.
+
+ 1.9. "Modifications" means any addition to or deletion from the
+ substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+ A. Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+
+ B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+
+ 1.10. "Original Code" means Source Code of computer software code
+ which is described in the Source Code notice required by Exhibit A as
+ Original Code, and which, at the time of its release under this
+ License is not already Covered Code governed by this License.
+
+ 1.10.1. "Patent Claims" means any patent claim(s), now owned or
+ hereafter acquired, including without limitation, method, process,
+ and apparatus claims, in any patent Licensable by grantor.
+
+ 1.11. "Source Code" means the preferred form of the Covered Code for
+ making modifications to it, including all modules it contains, plus
+ any associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or source code
+ differential comparisons against either the Original Code or another
+ well known, available Covered Code of the Contributor's choice. The
+ Source Code can be in a compressed or archival form, provided the
+ appropriate decompression or de-archiving software is widely available
+ for no charge.
+
+ 1.12. "You" (or "Your") means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of, this
+ License or a future version of this License issued under Section 6.1.
+ For legal entities, "You" includes any entity which controls, is
+ controlled by, or is under common control with You. For purposes of
+ this definition, "control" means (a) the power, direct or indirect,
+ to cause the direction or management of such entity, whether by
+ contract or otherwise, or (b) ownership of more than fifty percent
+ (50%) of the outstanding shares or beneficial ownership of such
+ entity.
+
+2. Source Code License.
+
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer to use, reproduce,
+ modify, display, perform, sublicense and distribute the Original
+ Code (or portions thereof) with or without Modifications, and/or
+ as part of a Larger Work; and
+
+ (b) under Patents Claims infringed by the making, using or
+ selling of Original Code, to make, have made, use, practice,
+ sell, and offer for sale, and/or otherwise dispose of the
+ Original Code (or portions thereof).
+
+ (c) the licenses granted in this Section 2.1(a) and (b) are
+ effective on the date Initial Developer first distributes
+ Original Code under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: 1) for code that You delete from the Original Code; 2)
+ separate from the Original Code; or 3) for infringements caused
+ by: i) the modification of the Original Code or ii) the
+ combination of the Original Code with other software or devices.
+
+ 2.2. Contributor Grant.
+ Subject to third party intellectual property claims, each Contributor
+ hereby grants You a world-wide, royalty-free, non-exclusive license
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Contributor, to use, reproduce, modify,
+ display, perform, sublicense and distribute the Modifications
+ created by such Contributor (or portions thereof) either on an
+ unmodified basis, with other Modifications, as Covered Code
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or
+ selling of Modifications made by that Contributor either alone
+ and/or in combination with its Contributor Version (or portions
+ of such combination), to make, use, sell, offer for sale, have
+ made, and/or otherwise dispose of: 1) Modifications made by that
+ Contributor (or portions thereof); and 2) the combination of
+ Modifications made by that Contributor with its Contributor
+ Version (or portions of such combination).
+
+ (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+ effective on the date Contributor first makes Commercial Use of
+ the Covered Code.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: 1) for any code that Contributor has deleted from the
+ Contributor Version; 2) separate from the Contributor Version;
+ 3) for infringements caused by: i) third party modifications of
+ Contributor Version or ii) the combination of Modifications made
+ by that Contributor with other software (except as part of the
+ Contributor Version) or other devices; or 4) under Patent Claims
+ infringed by Covered Code in the absence of Modifications made by
+ that Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Application of License.
+ The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section 2.2. The Source Code version of Covered Code may be
+ distributed only under the terms of this License or a future version
+ of this License released under Section 6.1, and You must include a
+ copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code
+ version that alters or restricts the applicable version of this
+ License or the recipients' rights hereunder. However, You may include
+ an additional document offering the additional rights described in
+ Section 3.5.
+
+ 3.2. Availability of Source Code.
+ Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License
+ either on the same media as an Executable version or via an accepted
+ Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic
+ Distribution Mechanism, must remain available for at least twelve (12)
+ months after the date it initially became available, or at least six
+ (6) months after a subsequent version of that particular Modification
+ has been made available to such recipients. You are responsible for
+ ensuring that the Source Code version remains available even if the
+ Electronic Distribution Mechanism is maintained by a third party.
+
+ 3.3. Description of Modifications.
+ You must cause all Covered Code to which You contribute to contain a
+ file documenting the changes You made to create that Covered Code and
+ the date of any change. You must include a prominent statement that
+ the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the
+ Initial Developer in (a) the Source Code, and (b) in any notice in an
+ Executable version or related documentation in which You describe the
+ origin or ownership of the Covered Code.
+
+ 3.4. Intellectual Property Matters
+ (a) Third Party Claims.
+ If Contributor has knowledge that a license under a third party's
+ intellectual property rights is required to exercise the rights
+ granted by such Contributor under Sections 2.1 or 2.2,
+ Contributor must include a text file with the Source Code
+ distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will
+ know whom to contact. If Contributor obtains such knowledge after
+ the Modification is made available as described in Section 3.2,
+ Contributor shall promptly modify the LEGAL file in all copies
+ Contributor makes available thereafter and shall take other steps
+ (such as notifying appropriate mailing lists or newsgroups)
+ reasonably calculated to inform those who received the Covered
+ Code that new knowledge has been obtained.
+
+ (b) Contributor APIs.
+ If Contributor's Modifications include an application programming
+ interface and Contributor has knowledge of patent licenses which
+ are reasonably necessary to implement that API, Contributor must
+ also include this information in the LEGAL file.
+
+ (c) Representations.
+ Contributor represents that, except as disclosed pursuant to
+ Section 3.4(a) above, Contributor believes that Contributor's
+ Modifications are Contributor's original creation(s) and/or
+ Contributor has sufficient rights to grant the rights conveyed by
+ this License.
+
+ 3.5. Required Notices.
+ You must duplicate the notice in Exhibit A in each file of the Source
+ Code. If it is not possible to put such notice in a particular Source
+ Code file due to its structure, then You must include such notice in a
+ location (such as a relevant directory) where a user would be likely
+ to look for such a notice. If You created one or more Modification(s)
+ You may add your name as a Contributor to the notice described in
+ Exhibit A. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership
+ rights relating to Covered Code. You may choose to offer, and to
+ charge a fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Code. However, You
+ may do so only on Your own behalf, and not on behalf of the Initial
+ Developer or any Contributor. You must make it absolutely clear than
+ any such warranty, support, indemnity or liability obligation is
+ offered by You alone, and You hereby agree to indemnify the Initial
+ Developer and every Contributor for any liability incurred by the
+ Initial Developer or such Contributor as a result of warranty,
+ support, indemnity or liability terms You offer.
+
+ 3.6. Distribution of Executable Versions.
+ You may distribute Covered Code in Executable form only if the
+ requirements of Section 3.1-3.5 have been met for that Covered Code,
+ and if You include a notice stating that the Source Code version of
+ the Covered Code is available under the terms of this License,
+ including a description of how and where You have fulfilled the
+ obligations of Section 3.2. The notice must be conspicuously included
+ in any notice in an Executable version, related documentation or
+ collateral in which You describe recipients' rights relating to the
+ Covered Code. You may distribute the Executable version of Covered
+ Code or ownership rights under a license of Your choice, which may
+ contain terms different from this License, provided that You are in
+ compliance with the terms of this License and that the license for the
+ Executable version does not attempt to limit or alter the recipient's
+ rights in the Source Code version from the rights set forth in this
+ License. If You distribute the Executable version under a different
+ license You must make it absolutely clear that any terms which differ
+ from this License are offered by You alone, not by the Initial
+ Developer or any Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by
+ the Initial Developer or such Contributor as a result of any such
+ terms You offer.
+
+ 3.7. Larger Works.
+ You may create a Larger Work by combining Covered Code with other code
+ not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Code due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description
+ must be included in the LEGAL file described in Section 3.4 and must
+ be included with all distributions of the Source Code. Except to the
+ extent prohibited by statute or regulation, such description must be
+ sufficiently detailed for a recipient of ordinary skill to be able to
+ understand it.
+
+5. Application of this License.
+
+ This License applies to code to which the Initial Developer has
+ attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+ 6.1. New Versions.
+ Netscape Communications Corporation ("Netscape") may publish revised
+ and/or new versions of the License from time to time. Each version
+ will be given a distinguishing version number.
+
+ 6.2. Effect of New Versions.
+ Once Covered Code has been published under a particular version of the
+ License, You may always continue to use it under the terms of that
+ version. You may also choose to use such Covered Code under the terms
+ of any subsequent version of the License published by Netscape. No one
+ other than Netscape has the right to modify the terms applicable to
+ Covered Code created under this License.
+
+ 6.3. Derivative Works.
+ If You create or use a modified version of this License (which you may
+ only do in order to apply it to code which is not already Covered Code
+ governed by this License), You must (a) rename Your license so that
+ the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+ "MPL", "NPL" or any confusingly similar phrase do not appear in your
+ license (except to note that your license differs from this License)
+ and (b) otherwise make it clear that Your version of the license
+ contains terms which differ from the Mozilla Public License and
+ Netscape Public License. (Filling in the name of the Initial
+ Developer, Original Code or Contributor in the notice described in
+ Exhibit A shall not of themselves be deemed to be modifications of
+ this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+ THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+ IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+ YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+ COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+ OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+ 8.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. All
+ sublicenses to the Covered Code which are properly granted shall
+ survive any termination of this License. Provisions which, by their
+ nature, must remain in effect beyond the termination of this License
+ shall survive.
+
+ 8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer
+ or a Contributor (the Initial Developer or Contributor against whom
+ You file such action is referred to as "Participant") alleging that:
+
+ (a) such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such
+ Participant to You under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate prospectively,
+ unless if within 60 days after receipt of notice You either: (i)
+ agree in writing to pay Participant a mutually agreeable reasonable
+ royalty for Your past and future use of Modifications made by such
+ Participant, or (ii) withdraw Your litigation claim with respect to
+ the Contributor Version against such Participant. If within 60 days
+ of notice, a reasonable royalty and payment arrangement are not
+ mutually agreed upon in writing by the parties or the litigation claim
+ is not withdrawn, the rights granted by Participant to You under
+ Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+ the 60 day notice period specified above.
+
+ (b) any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then
+ any rights granted to You by such Participant under Sections 2.1(b)
+ and 2.2(b) are revoked effective as of the date You first made, used,
+ sold, distributed, or had made, Modifications made by that
+ Participant.
+
+ 8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or
+ indirectly infringes any patent where such claim is resolved (such as
+ by license or settlement) prior to the initiation of patent
+ infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken
+ into account in determining the amount or value of any payment or
+ license.
+
+ 8.4. In the event of termination under Sections 8.1 or 8.2 above,
+ all end user license agreements (excluding distributors and resellers)
+ which have been validly granted by You or any distributor hereunder
+ prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+ OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+ ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+ CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+ WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+ RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+ THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+ The Covered Code is a "commercial item," as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+ software" and "commercial computer software documentation," as such
+ terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+ C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+ all U.S. Government End Users acquire Covered Code with only those
+ rights set forth herein.
+
+11. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. This License shall be governed by
+ California law provisions (except to the extent applicable law, if
+ any, provides otherwise), excluding its conflict-of-law provisions.
+ With respect to disputes in which at least one party is a citizen of,
+ or an entity chartered or registered to do business in the United
+ States of America, any litigation relating to this License shall be
+ subject to the jurisdiction of the Federal Courts of the Northern
+ District of California, with venue lying in Santa Clara County,
+ California, with the losing party responsible for costs, including
+ without limitation, court costs and reasonable attorneys' fees and
+ expenses. The application of the United Nations Convention on
+ Contracts for the International Sale of Goods is expressly excluded.
+ Any law or regulation which provides that the language of a contract
+ shall be construed against the drafter shall not apply to this
+ License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or indirectly,
+ out of its utilization of rights under this License and You agree to
+ work with Initial Developer and Contributors to distribute such
+ responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+ Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial
+ Developer permits you to utilize portions of the Covered Code under
+ Your choice of the NPL or the alternative licenses, if any, specified
+ by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is ______________________________________.
+
+ The Initial Developer of the Original Code is ________________________.
+ Portions created by ______________________ are Copyright (C) ______
+ _______________________. All Rights Reserved.
+
+ Contributor(s): ______________________________________.
+
+ Alternatively, the contents of this file may be used under the terms
+ of the _____ license (the "[___] License"), in which case the
+ provisions of [______] License are applicable instead of those
+ above. If you wish to allow use of your version of this file only
+ under the terms of the [____] License and not to allow others to use
+ your version of this file under the MPL, indicate your decision by
+ deleting the provisions above and replace them with the notice and
+ other provisions required by the [___] License. If you do not delete
+ the provisions above, a recipient may use your version of this file
+ under either the MPL or the [___] License."
+
+ [NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.]
Added: lucene/dev/trunk/solr/licenses/juniversalchardet-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/juniversalchardet-NOTICE.txt?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/juniversalchardet-NOTICE.txt (added)
+++ lucene/dev/trunk/solr/licenses/juniversalchardet-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -0,0 +1,6 @@
+Project home page: http://code.google.com/p/juniversalchardet/
+Java port by Kohei TAKETA (No copyright specified)
+
+The library is subject to the Mozilla Public License Version 1.1.
+Alternatively, the library may be used under the terms of either the GNU General Public License Version 2 or later,
+or the GNU Lesser General Public License 2.1 or later.
\ No newline at end of file
Added: lucene/dev/trunk/solr/licenses/pdfbox-1.7.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/pdfbox-1.7.0.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/pdfbox-1.7.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/pdfbox-1.7.0.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+45c684543f4a59a22aa32ae14bb73ea66cbeccb6
Modified: lucene/dev/trunk/solr/licenses/pdfbox-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/pdfbox-NOTICE.txt?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/licenses/pdfbox-NOTICE.txt (original)
+++ lucene/dev/trunk/solr/licenses/pdfbox-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -1,10 +1,14 @@
-
Apache PDFBox
-Copyright 2002-2010 The Apache Software Foundation
+Copyright 2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-Based on source code contributed to the original PDFBox project.
+Based on source code originally developed in the PDFBox, JempBox and
+FontBox projects.
Copyright (c) 2002-2007, www.pdfbox.org
+Copyright (c) 2006-2007, www.jempbox.org
+
+Based on source code originally developed in the PaDaF project.
+Copyright (c) 2010 Atos Worldline SAS
+
Added: lucene/dev/trunk/solr/licenses/poi-3.8.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-3.8.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-3.8.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-3.8.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+552a7703d32c57adb611df084b45f7158e8653f3
Added: lucene/dev/trunk/solr/licenses/poi-ooxml-3.8.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-ooxml-3.8.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-ooxml-3.8.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-ooxml-3.8.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+235d18adccc2b140fb3f90a2fa859b7ae29d57b8
Added: lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-ooxml-schemas-3.8.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+cb3b26809ec65eba22143acfddf654bcf70aa009
Added: lucene/dev/trunk/solr/licenses/poi-scratchpad-3.8.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/poi-scratchpad-3.8.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/poi-scratchpad-3.8.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/poi-scratchpad-3.8.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+33ef3eb7bd97c0dcdf2873b0e0a0938f013d410c
Added: lucene/dev/trunk/solr/licenses/tika-core-1.2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-core-1.2.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-core-1.2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/tika-core-1.2.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+d17ad28bb6030b58449edeed397d87a5661e8cc1
Modified: lucene/dev/trunk/solr/licenses/tika-core-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-core-NOTICE.txt?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-core-NOTICE.txt (original)
+++ lucene/dev/trunk/solr/licenses/tika-core-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -1,8 +1,15 @@
-
-Apache Tika core
-Copyright 2007-2010 The Apache Software Foundation
+Apache Tika
+Copyright 2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata
+This software contains code derived from UCAR/Unidata's NetCDF library.
+
+Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and
+Grizzly (http://grizzly.java.net/)
+
+OpenCSV: Copyright 2005 Bytecode Pty Ltd. Licensed under the Apache License, Version 2.0
+IPTC Photo Metadata descriptions Copyright 2010 International Press Telecommunications Council.
Added: lucene/dev/trunk/solr/licenses/tika-parsers-1.2.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-parsers-1.2.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-parsers-1.2.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/tika-parsers-1.2.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+ddc3e6ad93bca50e5a0267087d8ced26863bd64d
Modified: lucene/dev/trunk/solr/licenses/tika-parsers-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/tika-parsers-NOTICE.txt?rev=1374501&r1=1374500&r2=1374501&view=diff
==============================================================================
--- lucene/dev/trunk/solr/licenses/tika-parsers-NOTICE.txt (original)
+++ lucene/dev/trunk/solr/licenses/tika-parsers-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -1,8 +1,15 @@
-
Apache Tika parsers
-Copyright 2007-2010 The Apache Software Foundation
+Copyright 2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Copyright 1993-2010 University Corporation for Atmospheric Research/Unidata
+This software contains code derived from UCAR/Unidata's NetCDF library.
+
+Tika-server compoment uses CDDL-licensed dependencies: jersey (http://jersey.java.net/) and
+Grizzly (http://grizzly.java.net/)
+
+OpenCSV: Copyright 2005 Bytecode Pty Ltd. Licensed under the Apache License, Version 2.0
+IPTC Photo Metadata descriptions Copyright 2010 International Press Telecommunications Council.
Added: lucene/dev/trunk/solr/licenses/xz-1.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/xz-1.0.jar.sha1?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/xz-1.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/xz-1.0.jar.sha1 Sat Aug 18 01:47:40 2012
@@ -0,0 +1 @@
+ecff5cb8b1189514c9d1d8d68eb77ac372e000c9
Added: lucene/dev/trunk/solr/licenses/xz-LICENSE-PD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/xz-LICENSE-PD.txt?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/xz-LICENSE-PD.txt (added)
+++ lucene/dev/trunk/solr/licenses/xz-LICENSE-PD.txt Sat Aug 18 01:47:40 2012
@@ -0,0 +1,8 @@
+XZ for Java 1.0 (2011-10-22)
+
+http://tukaani.org/xz/java.html
+
+This Java implementation of XZ has been put into the public domain,
+thus you can do whatever you want with it. All the files in the package
+have been written by Lasse Collin, but some files are heavily based
+on public domain code written by Igor Pavlov.
\ No newline at end of file
Added: lucene/dev/trunk/solr/licenses/xz-NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/xz-NOTICE.txt?rev=1374501&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/xz-NOTICE.txt (added)
+++ lucene/dev/trunk/solr/licenses/xz-NOTICE.txt Sat Aug 18 01:47:40 2012
@@ -0,0 +1,8 @@
+XZ for Java 1.0 (2011-10-22)
+
+http://tukaani.org/xz/java.html
+
+This Java implementation of XZ has been put into the public domain,
+thus you can do whatever you want with it. All the files in the package
+have been written by Lasse Collin, but some files are heavily based
+on public domain code written by Igor Pavlov.
\ No newline at end of file