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:59:35 UTC
svn commit: r1328874 - in /lucene/dev/trunk/lucene: ./
analysis/common/src/java/org/apache/lucene/collation/
memory/src/java/org/apache/lucene/index/memory/ queryparser/docs/xml/
queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/ que...
Author: rmuir
Date: Sun Apr 22 12:59:34 2012
New Revision: 1328874
URL: http://svn.apache.org/viewvc?rev=1328874&view=rev
Log:
nuke more contrib references
Modified:
lucene/dev/trunk/lucene/JRE_VERSION_MIGRATION.txt
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilter.java
lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/trunk/lucene/module-build.xml
lucene/dev/trunk/lucene/queryparser/docs/xml/README.htm
lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
Modified: lucene/dev/trunk/lucene/JRE_VERSION_MIGRATION.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/JRE_VERSION_MIGRATION.txt?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/JRE_VERSION_MIGRATION.txt (original)
+++ lucene/dev/trunk/lucene/JRE_VERSION_MIGRATION.txt Sun Apr 22 12:59:34 2012
@@ -31,6 +31,6 @@ using this Analyzer you are NOT affected
* SimpleAnalyzer, StopAnalyzer, LetterTokenizer, LowerCaseFilter, and
LowerCaseTokenizer may return different results, along with many other Analyzers
-and TokenStreams in Lucene's contrib area. If you are using one of these
+and TokenStreams in Lucene's analysis modules. If you are using one of these
components, you may be affected.
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java Sun Apr 22 12:59:34 2012
@@ -51,8 +51,8 @@ import org.apache.lucene.util.AttributeS
* </li>
* </ol>
* <p>
- * The <code>ICUCollationAttributeFactory</code> in the icu package of Lucene's
- * contrib area uses ICU4J's Collator, which makes its
+ * The <code>ICUCollationAttributeFactory</code> in the analysis-icu package
+ * uses ICU4J's Collator, which makes its
* version available, thus allowing collation to be versioned independently
* from the JVM. ICUCollationAttributeFactory is also significantly faster and
* generates significantly shorter keys than CollationAttributeFactory. See
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java Sun Apr 22 12:59:34 2012
@@ -58,8 +58,8 @@ import java.io.Reader;
* </li>
* </ol>
* <p>
- * The <code>ICUCollationKeyAnalyzer</code> in the icu package of Lucene's
- * contrib area uses ICU4J's Collator, which makes its
+ * The <code>ICUCollationKeyAnalyzer</code> in the analysis-icu package
+ * uses ICU4J's Collator, which makes its
* its version available, thus allowing collation to be versioned
* independently from the JVM. ICUCollationKeyAnalyzer is also significantly
* faster and generates significantly shorter keys than CollationKeyAnalyzer.
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilter.java?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyFilter.java Sun Apr 22 12:59:34 2012
@@ -55,8 +55,8 @@ import java.text.Collator;
* </li>
* </ol>
* <p>
- * The <code>ICUCollationKeyFilter</code> in the icu package of Lucene's
- * contrib area uses ICU4J's Collator, which makes its
+ * The <code>ICUCollationKeyFilter</code> in the analysis-icu package
+ * uses ICU4J's Collator, which makes its
* version available, thus allowing collation to be versioned independently
* from the JVM. ICUCollationKeyFilter is also significantly faster and
* generates significantly shorter keys than CollationKeyFilter. See
Modified: lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/trunk/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Sun Apr 22 12:59:34 2012
@@ -325,7 +325,7 @@ public class MemoryIndex {
* Equivalent to adding a tokenized, indexed, termVectorStored, unstored,
* Lucene {@link org.apache.lucene.document.Field}.
* Finally closes the token stream. Note that untokenized keywords can be added with this method via
- * {@link #keywordTokenStream(Collection)}, the Lucene contrib <code>KeywordTokenizer</code> or similar utilities.
+ * {@link #keywordTokenStream(Collection)}, the Lucene <code>KeywordTokenizer</code> or similar utilities.
*
* @param fieldName
* a name to be associated with the text
Modified: lucene/dev/trunk/lucene/module-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/module-build.xml?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/module-build.xml (original)
+++ lucene/dev/trunk/lucene/module-build.xml Sun Apr 22 12:59:34 2012
@@ -20,7 +20,7 @@
<project name="module-build" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<echo>Building ${ant.project.name}...</echo>
- <!-- TODO: adjust build.dir/dist.dir appropriately when a contrib project is run individually -->
+ <!-- TODO: adjust build.dir/dist.dir appropriately when a module is run individually -->
<dirname file="${ant.file.module-build}" property="module-build.dir"/>
<property name="build.dir" location="${module-build.dir}/build/${ant.project.name}"/>
<property name="dist.dir" location="${module-build.dir}/dist/${ant.project.name}"/>
Modified: lucene/dev/trunk/lucene/queryparser/docs/xml/README.htm
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/docs/xml/README.htm?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/docs/xml/README.htm (original)
+++ lucene/dev/trunk/lucene/queryparser/docs/xml/README.htm Sun Apr 22 12:59:34 2012
@@ -30,6 +30,6 @@
<li>A modular design with expandable support for new query/filter types</li>
</ul>
</p>
- <p>This code is dependent on the "queries" contrib module although the "CoreParser" can be compiled with just Lucene core if required</p>
+ <p>This code is dependent on the "queries" module although the "CoreParser" can be compiled with just Lucene core if required</p>
</body>
</html>
\ No newline at end of file
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java Sun Apr 22 12:59:34 2012
@@ -893,7 +893,7 @@ public class TestQPHelper extends Lucene
assertEscapedQueryEquals("&& abc &&", a, "\\&\\& abc \\&\\&");
}
- @Ignore("contrib queryparser shouldn't escape wildcard terms")
+ @Ignore("flexible queryparser shouldn't escape wildcard terms")
public void testEscapedWildcard() throws Exception {
StandardQueryParser qp = new StandardQueryParser();
qp.setAnalyzer(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false));
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java?rev=1328874&r1=1328873&r2=1328874&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java Sun Apr 22 12:59:34 2012
@@ -52,7 +52,7 @@ import org.apache.lucene.util.automaton.
* Base Test class for QueryParser subclasses
*/
// TODO: it would be better to refactor the parts that are specific really
-// to the core QP and subclass/use the parts that are not in the contrib QP
+// to the core QP and subclass/use the parts that are not in the flexible QP
public abstract class QueryParserTestBase extends LuceneTestCase {
public static Analyzer qpAnalyzer = new QPTestAnalyzer();