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/05/04 01:36:04 UTC
svn commit: r940676 - in /lucene/dev/trunk: lucene/
lucene/backwards/src/java/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/contr...
Author: rmuir
Date: Mon May 3 23:36:03 2010
New Revision: 940676
URL: http://svn.apache.org/viewvc?rev=940676&view=rev
Log:
LUCENE-2413: move high-level charfilters to contrib/analyzers
Added:
lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/
lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java
- copied, changed from r940637, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java
lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java
- copied, changed from r940637, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/MappingCharFilter.java
lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java
- copied, changed from r940637, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NormalizeCharMap.java
lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/
lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
- copied, changed from r940637, lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestMappingCharFilter.java
Removed:
lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/analysis/BaseCharFilter.java
lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/analysis/MappingCharFilter.java
lucene/dev/trunk/lucene/backwards/src/java/org/apache/lucene/analysis/NormalizeCharMap.java
lucene/dev/trunk/lucene/backwards/src/test/org/apache/lucene/analysis/TestMappingCharFilter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/MappingCharFilter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NormalizeCharMap.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestMappingCharFilter.java
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java
lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java
lucene/dev/trunk/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=940676&r1=940675&r2=940676&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon May 3 23:36:03 2010
@@ -11,6 +11,9 @@ Changes in backwards compatibility polic
- o.a.l.analysis.LengthFilter -> o.a.l.analysis.miscellaneous.LengthFilter
- o.a.l.analysis.PerFieldAnalyzerWrapper -> o.a.l.analysis.miscellaneous.PerFieldAnalyzerWrapper
- o.a.l.analysis.TeeSinkTokenFilter -> o.a.l.analysis.sinks.TeeSinkTokenFilter
+ - o.a.l.analysis.BaseCharFilter -> o.a.l.analysis.charfilter.BaseCharFilter
+ - o.a.l.analysis.MappingCharFilter -> o.a.l.analysis.charfilter.MappingCharFilter
+ - o.a.l.analysis.NormalizeCharMap -> o.a.l.analysis.charfilter.NormalizeCharMap
... (in progress)
* LUCENE-1458, LUCENE-2111, LUCENE-2354: Changes from flexible indexing:
Copied: lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java (from r940637, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java?p2=lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java&p1=lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java&r1=940637&r2=940676&rev=940676&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/BaseCharFilter.java (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java Mon May 3 23:36:03 2010
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.lucene.analysis;
+package org.apache.lucene.analysis.charfilter;
import java.util.ArrayList;
import java.util.List;
+import org.apache.lucene.analysis.CharFilter;
+import org.apache.lucene.analysis.CharStream;
+
/**
* Base utility class for implementing a {@link CharFilter}.
* You subclass this, and then record mappings by calling
Copied: lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java (from r940637, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/MappingCharFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java?p2=lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java&p1=lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/MappingCharFilter.java&r1=940637&r2=940676&rev=940676&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/MappingCharFilter.java (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java Mon May 3 23:36:03 2010
@@ -15,12 +15,15 @@
* limitations under the License.
*/
-package org.apache.lucene.analysis;
+package org.apache.lucene.analysis.charfilter;
import java.io.IOException;
import java.io.Reader;
import java.util.LinkedList;
+import org.apache.lucene.analysis.CharReader;
+import org.apache.lucene.analysis.CharStream;
+
/**
* Simplistic {@link CharFilter} that applies the mappings
* contained in a {@link NormalizeCharMap} to the character
Copied: lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java (from r940637, lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NormalizeCharMap.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java?p2=lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java&p1=lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NormalizeCharMap.java&r1=940637&r2=940676&rev=940676&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/analysis/NormalizeCharMap.java (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java Mon May 3 23:36:03 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.lucene.analysis;
+package org.apache.lucene.analysis.charfilter;
import java.util.HashMap;
import java.util.Map;
Copied: lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java (from r940637, lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestMappingCharFilter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java?p2=lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java&p1=lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestMappingCharFilter.java&r1=940637&r2=940676&rev=940676&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/analysis/TestMappingCharFilter.java (original)
+++ lucene/dev/trunk/lucene/contrib/analyzers/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java Mon May 3 23:36:03 2010
@@ -15,10 +15,16 @@
* limitations under the License.
*/
-package org.apache.lucene.analysis;
+package org.apache.lucene.analysis.charfilter;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.CharReader;
+import org.apache.lucene.analysis.CharStream;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.WhitespaceTokenizer;
+
public class TestMappingCharFilter extends BaseTokenStreamTestCase {
NormalizeCharMap normMap;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java?rev=940676&r1=940675&r2=940676&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilter.java Mon May 3 23:36:03 2010
@@ -24,7 +24,7 @@ import java.io.Reader;
import java.util.HashMap;
import java.util.Set;
-import org.apache.lucene.analysis.BaseCharFilter;
+import org.apache.lucene.analysis.charfilter.BaseCharFilter;
import org.apache.lucene.analysis.CharReader;
import org.apache.lucene.analysis.CharStream;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java?rev=940676&r1=940675&r2=940676&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java Mon May 3 23:36:03 2010
@@ -25,8 +25,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.lucene.analysis.CharStream;
-import org.apache.lucene.analysis.MappingCharFilter;
-import org.apache.lucene.analysis.NormalizeCharMap;
+import org.apache.lucene.analysis.charfilter.MappingCharFilter;
+import org.apache.lucene.analysis.charfilter.NormalizeCharMap;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.util.plugin.ResourceLoaderAware;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java?rev=940676&r1=940675&r2=940676&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilter.java Mon May 3 23:36:03 2010
@@ -22,7 +22,7 @@ import java.util.LinkedList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.lucene.analysis.BaseCharFilter;
+import org.apache.lucene.analysis.charfilter.BaseCharFilter;
import org.apache.lucene.analysis.CharStream;
/**
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java?rev=940676&r1=940675&r2=940676&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java Mon May 3 23:36:03 2010
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.lucene.analysis.CharReader;
import org.apache.lucene.analysis.CharStream;
-import org.apache.lucene.analysis.MappingCharFilter;
-import org.apache.lucene.analysis.NormalizeCharMap;
+import org.apache.lucene.analysis.charfilter.MappingCharFilter;
+import org.apache.lucene.analysis.charfilter.NormalizeCharMap;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java?rev=940676&r1=940675&r2=940676&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java Mon May 3 23:36:03 2010
@@ -312,7 +312,7 @@ public class FieldAnalysisRequestHandler
assertNotNull("expecting an index token analysis for field type 'charfilthtmlmap'", indexPart);
assertEquals(" whátëvêr ", indexPart.get("org.apache.solr.analysis.HTMLStripCharFilter"));
- assertEquals(" whatever ", indexPart.get("org.apache.lucene.analysis.MappingCharFilter"));
+ assertEquals(" whatever ", indexPart.get("org.apache.lucene.analysis.charfilter.MappingCharFilter"));
List<NamedList> tokenList = (List<NamedList>)indexPart.get("org.apache.lucene.analysis.WhitespaceTokenizer");
assertNotNull("Expecting WhitespaceTokenizer analysis breakdown", tokenList);