You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/03/10 19:42:13 UTC
svn commit: r1080312 - in /lucene/dev/branches/branch_3x: ./
dev-tools/eclipse/ dev-tools/maven/
dev-tools/maven/lucene/contrib/benchmark/ lucene/ lucene/contrib/benchmark/
lucene/contrib/benchmark/lib/ solr/
Author: sarowe
Date: Thu Mar 10 18:42:13 2011
New Revision: 1080312
URL: http://svn.apache.org/viewvc?rev=1080312&view=rev
Log:
LUCENE-2961: Remove benchmark/lib/xml-apis-2.9.0.jar - JVM 1.5+ contains these JAXP 1.3 interface classes
Removed:
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/xml-apis-2.9.0.jar
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/NOTICE.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/CHANGES.txt
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/NOTICE.txt
Modified: lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1080312&r1=1080311&r2=1080312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Thu Mar 10 18:42:13 2011
@@ -3,20 +3,9 @@
<classpathentry kind="src" path="lucene/src/java"/>
<classpathentry kind="src" path="lucene/src/test-framework"/>
<classpathentry kind="src" path="lucene/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/common/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/common/src/resources"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/common/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/smartcn/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/smartcn/src/resources"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/smartcn/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/stempel/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/stempel/src/resources"/>
- <classpathentry kind="src" path="lucene/contrib/analyzers/stempel/src/test"/>
<classpathentry kind="src" path="lucene/contrib/ant/src/java"/>
<classpathentry kind="src" path="lucene/contrib/ant/src/resources"/>
<classpathentry kind="src" path="lucene/contrib/ant/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/benchmark/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/benchmark/src/test"/>
<classpathentry kind="src" path="lucene/contrib/db/bdb/src/java"/>
<classpathentry kind="src" path="lucene/contrib/db/bdb/src/test"/>
<classpathentry kind="src" path="lucene/contrib/db/bdb-je/src/java"/>
@@ -25,9 +14,6 @@
<classpathentry kind="src" path="lucene/contrib/demo/src/test"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/java"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/icu/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/icu/src/resources"/>
- <classpathentry kind="src" path="lucene/contrib/icu/src/test"/>
<classpathentry kind="src" path="lucene/contrib/instantiated/src/java"/>
<classpathentry kind="src" path="lucene/contrib/instantiated/src/test"/>
<classpathentry kind="src" path="lucene/contrib/lucli/src/java"/>
@@ -41,8 +27,6 @@
<classpathentry kind="src" path="lucene/contrib/queryparser/src/java"/>
<classpathentry kind="src" path="lucene/contrib/queryparser/src/resources"/>
<classpathentry kind="src" path="lucene/contrib/queryparser/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/remote/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/remote/src/test"/>
<classpathentry kind="src" path="lucene/contrib/spatial/src/java"/>
<classpathentry kind="src" path="lucene/contrib/spatial/src/test"/>
<classpathentry kind="src" path="lucene/contrib/spellchecker/src/java"/>
@@ -53,6 +37,22 @@
<classpathentry kind="src" path="lucene/contrib/wordnet/src/test"/>
<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/java"/>
<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/test"/>
+ <classpathentry kind="src" path="modules/analysis/common/src/java"/>
+ <classpathentry kind="src" path="modules/analysis/common/src/resources"/>
+ <classpathentry kind="src" path="modules/analysis/common/src/test"/>
+ <classpathentry kind="src" path="modules/analysis/icu/src/java"/>
+ <classpathentry kind="src" path="modules/analysis/icu/src/resources"/>
+ <classpathentry kind="src" path="modules/analysis/icu/src/test"/>
+ <classpathentry kind="src" path="modules/analysis/phonetic/src/java"/>
+ <classpathentry kind="src" path="modules/analysis/phonetic/src/test"/>
+ <classpathentry kind="src" path="modules/analysis/smartcn/src/java"/>
+ <classpathentry kind="src" path="modules/analysis/smartcn/src/resources"/>
+ <classpathentry kind="src" path="modules/analysis/smartcn/src/test"/>
+ <classpathentry kind="src" path="modules/analysis/stempel/src/java"/>
+ <classpathentry kind="src" path="modules/analysis/stempel/src/resources"/>
+ <classpathentry kind="src" path="modules/analysis/stempel/src/test"/>
+ <classpathentry kind="src" path="modules/benchmark/src/java"/>
+ <classpathentry kind="src" path="modules/benchmark/src/test"/>
<classpathentry kind="src" path="solr/src/java"/>
<classpathentry kind="src" path="solr/src/webapp/src"/>
<classpathentry kind="src" path="solr/src/common"/>
@@ -82,18 +82,18 @@
<classpathentry kind="lib" path="lucene/lib/ant-junit-1.7.1.jar"/>
<classpathentry kind="lib" path="lucene/lib/junit-4.7.jar"/>
<classpathentry kind="lib" path="lucene/contrib/ant/lib/jtidy-r938.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-beanutils-1.7.0.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-collections-3.1.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-compress-1.0.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-digester-1.7.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-logging-1.0.4.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/benchmark/lib/xml-apis-2.9.0.jar"/>
<classpathentry kind="lib" path="lucene/contrib/db/bdb/lib/db-4.7.25.jar"/>
<classpathentry kind="lib" path="lucene/contrib/db/bdb-je/lib/je-3.3.93.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/icu/lib/icu4j-4_6.jar"/>
<classpathentry kind="lib" path="lucene/contrib/lucli/lib/jline.jar"/>
<classpathentry kind="lib" path="lucene/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
+ <classpathentry kind="lib" path="modules/analysis/icu/lib/icu4j-4_6.jar"/>
+ <classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.4.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/commons-beanutils-1.7.0.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/commons-collections-3.1.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.0.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.jar"/>
@@ -106,14 +106,16 @@
<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
<classpathentry kind="lib" path="solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
- <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.5.5.jar"/>
+ <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
<classpathentry kind="lib" path="solr/lib/junit-4.7.jar"/>
+ <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.1.jar"/>
<classpathentry kind="lib" path="solr/lib/servlet-api-2.4.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-api-1.5.5.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.5.5.jar"/>
- <classpathentry kind="lib" path="solr/lib/velocity-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/velocity-tools-2.0-beta3.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/velocity-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/velocity-tools-2.0.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
+ <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.1.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-6.1.26-patched-JETTY-1340.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-util-6.1.26-patched-JETTY-1340.jar"/>
<classpathentry kind="lib" path="solr/example/lib/servlet-api-2.5-20081211.jar"/>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template?rev=1080312&r1=1080311&r2=1080312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template Thu Mar 10 18:42:13 2011
@@ -88,10 +88,6 @@
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template?rev=1080312&r1=1080311&r2=1080312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template Thu Mar 10 18:42:13 2011
@@ -368,11 +368,6 @@
<version>2.9.1-patched-XERCESJ-1257</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -647,20 +642,6 @@
</configuration>
</execution>
<execution>
- <id>install-xml-apis</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.0</version>
- <packaging>jar</packaging>
- <file>lucene/contrib/benchmark/lib/xml-apis-2.9.0.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-berkeleydb</id>
<phase>install</phase>
<goals>
Modified: lucene/dev/branches/branch_3x/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/NOTICE.txt?rev=1080312&r1=1080311&r2=1080312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/NOTICE.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/NOTICE.txt Thu Mar 10 18:42:13 2011
@@ -56,7 +56,7 @@ including, but not limited to:
- Commons Compress (contrib/benchmark/lib/commons-compress-1.0.jar)
- Commons Digester (contrib/benchmark/lib/commons-digester-1.7.jar)
- Commons Logging (contrib/benchmark/lib/commons-logging-1.0.4.jar)
- - Xerces (contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar, contrib/benchmark/lib/xml-apis-2.9.0.jar)
+ - Xerces (contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar)
The SmartChineseAnalyzer source code (under contrib/analyzers) was
provided by Xiaoping Gao and copyright 2009 by www.imdict.net.
Modified: lucene/dev/branches/branch_3x/lucene/contrib/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/benchmark/CHANGES.txt?rev=1080312&r1=1080311&r2=1080312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/benchmark/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/benchmark/CHANGES.txt Thu Mar 10 18:42:13 2011
@@ -2,12 +2,21 @@ Lucene Benchmark Contrib Change Log
The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
+03/10/2011
+ LUCENE-2961: Removed lib/xml-apis.jar, since JVM 1.5+ already contains the
+ JAXP 1.3 interface classes it provides.
+
02/03/2011
LUCENE-1540: Improvements to contrib.benchmark for TREC collections.
ContentSource can now process plain text files, gzip files, and bzip2 files.
TREC doc parsing now handles the TREC gov2 collection and TREC disks 4&5-CR
collection (both used by many TREC tasks). (Shai Erera, Doron Cohen)
-
+
+01/31/2011
+ LUCENE-1591: Rollback to xerces-2.9.1-patched-XERCESJ-1257.jar to workaround
+ XERCESJ-1257, which we hit on current Wikipedia XML export
+ (ENWIKI-20110115-pages-articles.xml) with xerces-2.10.0.jar. (Mike McCandless)
+
01/26/2011
LUCENE-929: ExtractReuters first extracts to a tmp dir and then renames. That
way, if a previous extract attempt failed, "ant extract-reuters" will still
@@ -29,7 +38,7 @@ The Benchmark contrib package contains c
4/27/2010
LUCENE-2416: WriteLineDocTask now supports multi-threading. Also,
StringBufferReader was renamed to StringBuilderReader and works on
- StringBuilder now. In addition, LongToEnglishCountentSource starts from 0
+ StringBuilder now. In addition, LongToEnglishContentSource starts from 0
(instead of Long.MIN_VAL+10) and wraps around to MIN_VAL (if you ever hit
Long.MAX_VAL). (Shai Erera)
Modified: lucene/dev/branches/branch_3x/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/NOTICE.txt?rev=1080312&r1=1080311&r2=1080312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/NOTICE.txt (original)
+++ lucene/dev/branches/branch_3x/solr/NOTICE.txt Thu Mar 10 18:42:13 2011
@@ -75,7 +75,7 @@ including, but not limited to:
- Commons Compress (lib/commons-compress-1.0.jar)
- Commons Digester (lib/commons-digester-1.7.jar)
- Commons Logging (lib/commons-logging-1.0.4.jar)
- - Xerces (lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar, lib/xml-apis-2.9.0.jar)
+ - Xerces (lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar)
- Apache Commons
The snowball stemmers in