You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/04/22 14:55:12 UTC
svn commit: r1328873 - in /lucene/dev/trunk: lucene/
lucene/analysis/icu/src/java/ lucene/benchmark/conf/
lucene/core/src/java/org/apache/lucene/analysis/
lucene/core/src/java/org/apache/lucene/search/ lucene/misc/
lucene/misc/src/java/ lucene/test-fra...
Author: rmuir
Date: Sun Apr 22 12:55:11 2012
New Revision: 1328873
URL: http://svn.apache.org/viewvc?rev=1328873&view=rev
Log:
nuke some outdated references to contrib
Modified:
lucene/dev/trunk/lucene/MIGRATE.txt
lucene/dev/trunk/lucene/NOTICE.txt
lucene/dev/trunk/lucene/analysis/icu/src/java/overview.html
lucene/dev/trunk/lucene/benchmark/conf/createLineFile.alg
lucene/dev/trunk/lucene/benchmark/conf/extractWikipedia.alg
lucene/dev/trunk/lucene/benchmark/conf/indexLineFile.alg
lucene/dev/trunk/lucene/benchmark/conf/readContentSource.alg
lucene/dev/trunk/lucene/benchmark/conf/tokenize.alg
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/package.html
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java
lucene/dev/trunk/lucene/misc/README.txt
lucene/dev/trunk/lucene/misc/src/java/overview.html
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
lucene/dev/trunk/solr/NOTICE.txt
Modified: lucene/dev/trunk/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/MIGRATE.txt?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/MIGRATE.txt (original)
+++ lucene/dev/trunk/lucene/MIGRATE.txt Sun Apr 22 12:55:11 2012
@@ -376,7 +376,7 @@ LUCENE-1458, LUCENE-2111: Flexible Index
- o.a.l.util.CharacterUtils -> o.a.l.analysis.util.CharacterUtils
* LUCENE-2514: The option to use a Collator's order (instead of binary order) for
- sorting and range queries has been moved to contrib/queries.
+ sorting and range queries has been moved to lucene/queries.
The Collated TermRangeQuery/Filter has been moved to SlowCollatedTermRangeQuery/Filter,
and the collated sorting has been moved to SlowCollatedStringComparator.
Modified: lucene/dev/trunk/lucene/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/NOTICE.txt?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/NOTICE.txt (original)
+++ lucene/dev/trunk/lucene/NOTICE.txt Sun Apr 22 12:55:11 2012
@@ -12,8 +12,7 @@ including, but not limited to:
- Apache Xerces
ICU4J, (under analysis/icu) is licensed under an MIT styles license
-(contrib/icu/lib/ICU-LICENSE.txt) and Copyright (c) 1995-2008
-International Business Machines Corporation and others
+and Copyright (c) 1995-2008 International Business Machines Corporation and others
Some data files (under analysis/icu/src/data) are derived from Unicode data such
as the Unicode Character Database. See http://unicode.org/copyright.html for more
Modified: lucene/dev/trunk/lucene/analysis/icu/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/icu/src/java/overview.html?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/icu/src/java/overview.html (original)
+++ lucene/dev/trunk/lucene/analysis/icu/src/java/overview.html Sun Apr 22 12:55:11 2012
@@ -79,17 +79,14 @@ algorithm.
<hr/>
<h1><a name="collation">Collation</a></h1>
<p>
- <code>ICUCollationKeyFilter</code>
+ <code>ICUCollationKeyAnalyzer</code>
converts each token into its binary <code>CollationKey</code> using the
- provided <code>Collator</code>, and then encode the <code>CollationKey</code>
- as a String using
- {@link org.apache.lucene.util.IndexableBinaryStringTools}, to allow it to be
+ provided <code>Collator</code>, allowing it to be
stored as an index term.
</p>
<p>
- <code>ICUCollationKeyFilter</code> depends on ICU4J 4.4 to produce the
- <code>CollationKey</code>s. <code>icu4j-4.4.jar</code>
- is included in Lucene's Subversion repository at <code>contrib/icu/lib/</code>.
+ <code>ICUCollationKeyAnalyzer</code> depends on ICU4J to produce the
+ <code>CollationKey</code>s.
</p>
<h2>Use Cases</h2>
@@ -209,11 +206,11 @@ algorithm.
</li>
</ol>
<p>
- <code>ICUCollationKeyFilter</code> uses ICU4J's <code>Collator</code>, which
+ <code>ICUCollationKeyAnalyzer</code> uses ICU4J's <code>Collator</code>, which
makes its version available, thus allowing collation to be versioned
- independently from the JVM. <code>ICUCollationKeyFilter</code> is also
+ independently from the JVM. <code>ICUCollationKeyAnalyzer</code> is also
significantly faster and generates significantly shorter keys than
- <code>CollationKeyFilter</code>. See
+ <code>CollationKeyAnalyzer</code>. See
<a href="http://site.icu-project.org/charts/collation-icu4j-sun"
>http://site.icu-project.org/charts/collation-icu4j-sun</a> for key
generation timing and key length comparisons between ICU4J and
@@ -222,8 +219,8 @@ algorithm.
<p>
<code>CollationKey</code>s generated by <code>java.text.Collator</code>s are
not compatible with those those generated by ICU Collators. Specifically, if
- you use <code>CollationKeyFilter</code> to generate index terms, do not use
- <code>ICUCollationKeyFilter</code> on the query side, or vice versa.
+ you use <code>CollationKeyAnalyzer</code> to generate index terms, do not use
+ <code>ICUCollationKeyAnalyzer</code> on the query side, or vice versa.
</p>
<hr/>
<h1><a name="normalization">Normalization</a></h1>
Modified: lucene/dev/trunk/lucene/benchmark/conf/createLineFile.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/conf/createLineFile.alg?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/conf/createLineFile.alg (original)
+++ lucene/dev/trunk/lucene/benchmark/conf/createLineFile.alg Sun Apr 22 12:55:11 2012
@@ -20,7 +20,7 @@
# This alg will process the Reuters documents feed to produce a
# single file that contains all documents, one per line.
#
-# To use this, first cd to contrib/benchmark and then run:
+# To use this, first cd to benchmark and then run:
#
# ant run-task -Dtask.alg=conf/createLineFile.alg
#
Modified: lucene/dev/trunk/lucene/benchmark/conf/extractWikipedia.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/conf/extractWikipedia.alg?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/conf/extractWikipedia.alg (original)
+++ lucene/dev/trunk/lucene/benchmark/conf/extractWikipedia.alg Sun Apr 22 12:55:11 2012
@@ -20,7 +20,7 @@
# This alg will process the Wikipedia documents feed to produce a
# single file that contains all documents, one per line.
#
-# To use this, first cd to contrib/benchmark and then run:
+# To use this, first cd to benchmark and then run:
#
# ant run-task -Dtask.alg=conf/extractWikipedia.alg
#
Modified: lucene/dev/trunk/lucene/benchmark/conf/indexLineFile.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/conf/indexLineFile.alg?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/conf/indexLineFile.alg (original)
+++ lucene/dev/trunk/lucene/benchmark/conf/indexLineFile.alg Sun Apr 22 12:55:11 2012
@@ -24,7 +24,7 @@
# indexing your documents vs time spent creating the documents.
#
# To use this, you must first run the createLineFile.alg, then cd to
-# contrib/benchmark and then run:
+# benchmark and then run:
#
# ant run-task -Dtask.alg=conf/indexLineFile.alg
#
Modified: lucene/dev/trunk/lucene/benchmark/conf/readContentSource.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/conf/readContentSource.alg?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/conf/readContentSource.alg (original)
+++ lucene/dev/trunk/lucene/benchmark/conf/readContentSource.alg Sun Apr 22 12:55:11 2012
@@ -22,7 +22,7 @@
# gather baselines for operations like indexing (if reading from the content
# source takes 'X' time, we cannot index faster).
#
-# To use this, first cd to contrib/benchmark and then run:
+# To use this, first cd to benchmark and then run:
#
# ant run-task -Dtask.alg=conf/readContentSource.alg
#
Modified: lucene/dev/trunk/lucene/benchmark/conf/tokenize.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/benchmark/conf/tokenize.alg?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/benchmark/conf/tokenize.alg (original)
+++ lucene/dev/trunk/lucene/benchmark/conf/tokenize.alg Sun Apr 22 12:55:11 2012
@@ -20,7 +20,7 @@
# This alg reads all tokens out of a document but does not index them.
# This is useful for benchmarking tokenizers.
#
-# To use this, cd to contrib/benchmark and then run:
+# To use this, cd to benchmark and then run:
#
# ant run-task -Dtask.alg=conf/tokenize.alg
#
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/package.html?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/package.html (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/package.html Sun Apr 22 12:55:11 2012
@@ -229,7 +229,7 @@ and proximity searches (though sentence
Tokenizer, and TokenFilter(s) <i>(optional)</i> — or components you
create, or a combination of existing and newly created components. Before
pursuing this approach, you may find it worthwhile to explore the
- contrib/analyzers library and/or ask on the
+ <a href="{@docRoot}/../analyzers-common/overview-summary.html">analyzers-common</a> library and/or ask on the
<a href="http://lucene.apache.org/java/docs/mailinglists.html"
>java-user@lucene.apache.org mailing list</a> first to see if what you
need already exists. If you are still committed to creating your own
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java Sun Apr 22 12:55:11 2012
@@ -34,7 +34,7 @@ import org.apache.lucene.util.BytesRef;
* <p/>
*
* This is the same functionality as TermsFilter (from
- * contrib/queries), except this filter requires that the
+ * queries/), except this filter requires that the
* field contains only a single term for all documents.
* Because of drastically different implementations, they
* also have different performance characteristics, as
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSet.java Sun Apr 22 12:55:11 2012
@@ -28,7 +28,7 @@ import org.apache.lucene.util.Bits;
* <p/>
*
* Technically, this same functionality could be achieved
- * with ChainedFilter (under contrib/misc), however the
+ * with ChainedFilter (under queries/), however the
* benefit of this class is it never materializes the full
* bitset for the filter. Instead, the {@link #match}
* method is invoked on-demand, per docID visited during
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java Sun Apr 22 12:55:11 2012
@@ -38,7 +38,7 @@ import org.apache.lucene.util.automaton.
* <p>
* The supported syntax is documented in the {@link RegExp} class.
* Note this might be different than other regular expression implementations.
- * For some alternatives with different syntax, look under contrib/regex
+ * For some alternatives with different syntax, look under the sandbox.
* </p>
* <p>
* Note this query can be slow, as it needs to iterate over many terms. In order
Modified: lucene/dev/trunk/lucene/misc/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/README.txt?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/README.txt (original)
+++ lucene/dev/trunk/lucene/misc/README.txt Sun Apr 22 12:55:11 2012
@@ -1,3 +1,3 @@
-contrib/miscellaneous is a home of different Lucene-related classes
+miscellaneous is a home of different Lucene-related classes
that all belong to org.apache.lucene.misc package, as they are not
substantial enough to warrant their own package.
Modified: lucene/dev/trunk/lucene/misc/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/overview.html?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/overview.html (original)
+++ lucene/dev/trunk/lucene/misc/src/java/overview.html Sun Apr 22 12:55:11 2012
@@ -47,7 +47,7 @@ for details.
Steps to build:
<ul>
- <li> <tt>cd lucene/contrib/misc/</tt>
+ <li> <tt>cd lucene/misc/</tt>
<li> To compile NativePosixUtil.cpp -> libNativePosixUtil.so, run<tt> ant build-native-unix</tt>.
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java Sun Apr 22 12:55:11 2012
@@ -36,9 +36,9 @@ import org.apache.lucene.document.String
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocValues;
-/** Minimal port of contrib/benchmark's LneDocSource +
+/** Minimal port of benchmark's LneDocSource +
* DocMaker, so tests can enum docs from a line file created
- * by contrib/benchmark's WriteLineDoc task */
+ * by benchmark's WriteLineDoc task */
public class LineFileDocs implements Closeable {
private BufferedReader reader;
Modified: lucene/dev/trunk/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/NOTICE.txt?rev=1328873&r1=1328872&r2=1328873&view=diff
==============================================================================
--- lucene/dev/trunk/solr/NOTICE.txt (original)
+++ lucene/dev/trunk/solr/NOTICE.txt Sun Apr 22 12:55:11 2012
@@ -49,8 +49,7 @@ including, but not limited to:
- Apache Xerces
ICU4J, (under analysis/icu) is licensed under an MIT styles license
-(contrib/icu/lib/ICU-LICENSE.txt) and Copyright (c) 1995-2008
-International Business Machines Corporation and others
+and Copyright (c) 1995-2008 International Business Machines Corporation and others
Some data files (under analysis/icu/src/data) are derived from Unicode data such
as the Unicode Character Database. See http://unicode.org/copyright.html for more