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 2010/06/16 13:33:29 UTC
svn commit: r955203 - in /lucene/dev/trunk: lucene/contrib/benchmark/conf/
lucene/docs/ lucene/src/java/org/apache/lucene/analysis/
lucene/src/site/src/documentation/content/xdocs/
modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/
Author: rmuir
Date: Wed Jun 16 11:33:29 2010
New Revision: 955203
URL: http://svn.apache.org/viewvc?rev=955203&view=rev
Log:
LUCENE-2413: directory and package fixes
Modified:
lucene/dev/trunk/lucene/contrib/benchmark/conf/collector-small.alg
lucene/dev/trunk/lucene/contrib/benchmark/conf/collector.alg
lucene/dev/trunk/lucene/contrib/benchmark/conf/indexLineFile.alg
lucene/dev/trunk/lucene/docs/demo2.html
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo2.xml
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
Modified: lucene/dev/trunk/lucene/contrib/benchmark/conf/collector-small.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/benchmark/conf/collector-small.alg?rev=955203&r1=955202&r2=955203&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/benchmark/conf/collector-small.alg (original)
+++ lucene/dev/trunk/lucene/contrib/benchmark/conf/collector-small.alg Wed Jun 16 11:33:29 2010
@@ -23,7 +23,7 @@
# topScoreDocUnordered - Like above, but allows out of order
collector.class=coll:topScoreDocOrdered:topScoreDocUnordered:topScoreDocOrdered:topScoreDocUnordered
-analyzer=org.apache.lucene.analysis.WhitespaceAnalyzer
+analyzer=org.apache.lucene.analysis.core.WhitespaceAnalyzer
directory=FSDirectory
#directory=RamDirectory
Modified: lucene/dev/trunk/lucene/contrib/benchmark/conf/collector.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/benchmark/conf/collector.alg?rev=955203&r1=955202&r2=955203&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/benchmark/conf/collector.alg (original)
+++ lucene/dev/trunk/lucene/contrib/benchmark/conf/collector.alg Wed Jun 16 11:33:29 2010
@@ -23,7 +23,7 @@
# topScoreDocUnordered - Like above, but allows out of order
collector.class=coll:topScoreDocOrdered:topScoreDocUnordered:topScoreDocOrdered:topScoreDocUnordered
-analyzer=org.apache.lucene.analysis.WhitespaceAnalyzer
+analyzer=org.apache.lucene.analysis.core.WhitespaceAnalyzer
directory=FSDirectory
#directory=RamDirectory
Modified: lucene/dev/trunk/lucene/contrib/benchmark/conf/indexLineFile.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/benchmark/conf/indexLineFile.alg?rev=955203&r1=955202&r2=955203&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/benchmark/conf/indexLineFile.alg (original)
+++ lucene/dev/trunk/lucene/contrib/benchmark/conf/indexLineFile.alg Wed Jun 16 11:33:29 2010
@@ -29,7 +29,7 @@
# ant run-task -Dtask.alg=conf/indexLineFile.alg
#
-analyzer=org.apache.lucene.analysis.SimpleAnalyzer
+analyzer=org.apache.lucene.analysis.core.SimpleAnalyzer
# Feed that knows how to process the line file format:
content.source=org.apache.lucene.benchmark.byTask.feeds.LineDocSource
Modified: lucene/dev/trunk/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/docs/demo2.html?rev=955203&r1=955202&r2=955203&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/docs/demo2.html (original)
+++ lucene/dev/trunk/lucene/docs/demo2.html Wed Jun 16 11:33:29 2010
@@ -316,7 +316,7 @@ stop words and characters from the index
words such as articles (a, an, the, etc.) and other strings that may have less value for searching
(e.g. <b>'s</b>) . It should be noted that there are different rules for every language, and you
should use the proper analyzer for each. Lucene currently provides Analyzers for a number of
-different languages (see the <span class="codefrag">*Analyzer.java</span> sources under <a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/">contrib/analyzers/src/java/org/apache/lucene/analysis</a>).
+different languages (see the <span class="codefrag">*Analyzer.java</span> sources under <a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/">modules/analysis/common/src/java/org/apache/lucene/analysis</a>).
</p>
<p>
Looking further down in the file, you should see the <span class="codefrag">indexDocs()</span> code. This recursive
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html?rev=955203&r1=955202&r2=955203&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/package.html Wed Jun 16 11:33:29 2010
@@ -105,7 +105,7 @@ There are many post tokenization steps t
<li>{@link org.apache.lucene.analysis.PerFieldAnalyzerWrapper} – Most Analyzers perform the same operation on all
{@link org.apache.lucene.document.Field}s. The PerFieldAnalyzerWrapper can be used to associate a different Analyzer with different
{@link org.apache.lucene.document.Field}s.</li>
- <li>The contrib/analyzers library located at the root of the Lucene distribution has a number of different Analyzer implementations to solve a variety
+ <li>The modules/analysis library located at the root of the Lucene distribution has a number of different Analyzer implementations to solve a variety
of different problems related to searching. Many of the Analyzers are designed to analyze non-English languages.</li>
<li>The contrib/snowball library
located at the root of the Lucene distribution has Analyzer and TokenFilter
@@ -168,7 +168,7 @@ There are many post tokenization steps t
<h2>Implementing your own Analyzer</h2>
<p>Creating your own Analyzer is straightforward. It usually involves either wrapping an existing Tokenizer and set of TokenFilters to create a new Analyzer
or creating both the Analyzer and a Tokenizer or TokenFilter. Before pursuing this approach, you may find it worthwhile
-to explore the contrib/analyzers library and/or ask on the java-user@lucene.apache.org mailing list first to see if what you need already exists.
+to explore the modules/analysis library and/or ask on the java-user@lucene.apache.org mailing list first to see if what you need already exists.
If you are still committed to creating your own Analyzer or TokenStream derivation (Tokenizer or TokenFilter) have a look at
the source code of any one of the many samples located in this package.
</p>
Modified: lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo2.xml?rev=955203&r1=955202&r2=955203&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo2.xml (original)
+++ lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo2.xml Wed Jun 16 11:33:29 2010
@@ -74,7 +74,7 @@ words such as articles (a, an, the, etc.
(e.g. <b>'s</b>) . It should be noted that there are different rules for every language, and you
should use the proper analyzer for each. Lucene currently provides Analyzers for a number of
different languages (see the <code>*Analyzer.java</code> sources under <a
-href="http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/">contrib/analyzers/src/java/org/apache/lucene/analysis</a>).
+href="http://svn.apache.org/repos/asf/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/">modules/analysis/common/src/java/org/apache/lucene/analysis</a>).
</p>
<p>
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java?rev=955203&r1=955202&r2=955203&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java Wed Jun 16 11:33:29 2010
@@ -42,7 +42,7 @@ import java.util.Set;
* <li> As of 3.1, uses {@link TurkishLowerCaseFilter} for Turkish language.
* </ul>
* </p>
- * @deprecated Use the language-specific analyzer in contrib/analyzers instead.
+ * @deprecated Use the language-specific analyzer in modules/analysis instead.
* This analyzer will be removed in Lucene 4.0
*/
@Deprecated