From 5259d7d90bb3331ce2c3e512a0be55108ed74ffb Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 20 May 2010 13:23:12 +0000 Subject: [PATCH] LUCENE-2413: move KeywordMarkerFilter to analyzers module git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@946621 13f79535-47bb-0310-9956-ffa450edef68 --- modules/analysis/CHANGES.txt | 4 +++- .../apache/lucene/analysis/ar/ArabicAnalyzer.java | 2 +- .../lucene/analysis/ar/ArabicStemFilter.java | 2 +- .../lucene/analysis/bg/BulgarianAnalyzer.java | 2 +- .../lucene/analysis/bg/BulgarianStemFilter.java | 2 +- .../lucene/analysis/br/BrazilianAnalyzer.java | 2 +- .../lucene/analysis/br/BrazilianStemFilter.java | 2 +- .../apache/lucene/analysis/cz/CzechAnalyzer.java | 2 +- .../lucene/analysis/cz/CzechStemFilter.java | 2 +- .../apache/lucene/analysis/da/DanishAnalyzer.java | 2 +- .../apache/lucene/analysis/de/GermanAnalyzer.java | 2 +- .../lucene/analysis/de/GermanStemFilter.java | 2 +- .../lucene/analysis/el/GreekStemFilter.java | 2 +- .../lucene/analysis/en/EnglishAnalyzer.java | 2 +- .../lucene/analysis/es/SpanishAnalyzer.java | 2 +- .../lucene/analysis/fi/FinnishAnalyzer.java | 2 +- .../apache/lucene/analysis/fr/FrenchAnalyzer.java | 2 +- .../lucene/analysis/fr/FrenchStemFilter.java | 2 +- .../apache/lucene/analysis/hi/HindiAnalyzer.java | 2 +- .../analysis/hi/HindiNormalizationFilter.java | 2 +- .../lucene/analysis/hu/HungarianAnalyzer.java | 2 +- .../lucene/analysis/id/IndonesianAnalyzer.java | 2 +- .../lucene/analysis/it/ItalianAnalyzer.java | 2 +- .../miscellaneous}/KeywordMarkerFilter.java | 5 ++++- .../apache/lucene/analysis/nl/DutchAnalyzer.java | 2 +- .../lucene/analysis/nl/DutchStemFilter.java | 2 +- .../lucene/analysis/no/NorwegianAnalyzer.java | 2 +- .../lucene/analysis/pt/PortugueseAnalyzer.java | 2 +- .../lucene/analysis/ro/RomanianAnalyzer.java | 2 +- .../lucene/analysis/ru/RussianAnalyzer.java | 2 +- .../lucene/analysis/ru/RussianStemFilter.java | 2 +- .../lucene/analysis/sv/SwedishAnalyzer.java | 2 +- .../lucene/analysis/tr/TurkishAnalyzer.java | 2 +- .../lucene/analysis/ar/TestArabicStemFilter.java | 2 +- .../lucene/analysis/bg/TestBulgarianStemmer.java | 2 +- .../lucene/analysis/br/TestBrazilianStemmer.java | 2 +- .../lucene/analysis/cz/TestCzechStemmer.java | 2 +- .../lucene/analysis/de/TestGermanAnalyzer.java | 2 +- .../lucene/analysis/en/TestPorterStemFilter.java | 2 +- .../miscellaneous}/TestKeywordMarkerFilter.java | 7 ++++++- modules/analysis/smartcn/build.xml | 2 +- modules/analysis/stempel/build.xml | 15 +++++++++++++++ .../apache/lucene/analysis/pl/PolishAnalyzer.java | 2 +- .../solr/analysis/EnglishPorterFilterFactory.java | 2 +- .../solr/analysis/KeywordMarkerFilterFactory.java | 2 +- .../analysis/SnowballPorterFilterFactory.java | 2 +- 46 files changed, 70 insertions(+), 45 deletions(-) rename {lucene/src/java/org/apache/lucene/analysis => modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous}/KeywordMarkerFilter.java (93%) rename {lucene/src/test/org/apache/lucene/analysis => modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous}/TestKeywordMarkerFilter.java (90%) diff --git a/modules/analysis/CHANGES.txt b/modules/analysis/CHANGES.txt index 65e06379750..8e1b0db29b6 100644 --- a/modules/analysis/CHANGES.txt +++ b/modules/analysis/CHANGES.txt @@ -37,6 +37,7 @@ New Features - o.a.l.analysis.PorterStemFilter -> o.a.l.analysis.en.PorterStemFilter - o.a.l.analysis.ASCIIFoldingFilter -> o.a.l.analysis.miscellaneous.ASCIIFoldingFilter - o.a.l.analysis.ISOLatin1AccentFilter -> o.a.l.analysis.miscellaneous.ISOLatin1AccentFilter + - o.a.l.analysis.KeywordMarkerFilter -> o.a.l.analysis.miscellaneous.KeywordMarkerFilter - 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 @@ -48,4 +49,5 @@ New Features Build * LUCENE-2413: All analyzers in contrib/analyzers and contrib/icu were moved to the - analysis module. The 'smartcn' component now depends on 'common'. (Robert Muir) + analysis module. The 'smartcn' and 'stempel' components now depend on 'common'. + (Robert Muir) diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java index 8d182de4310..ec89f64b31c 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java @@ -26,7 +26,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java index 4e1846cbb90..f45e98d65da 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.ar; import java.io.IOException; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // javadoc @link import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java index f0e223004db..99aa34f8280 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java index 823d9c90210..30387f0a694 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.bg; import java.io.IOException; -import org.apache.lucene.analysis.KeywordMarkerFilter; // for javadoc +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // for javadoc import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java index ee529e1447d..a24e4316d48 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java @@ -29,7 +29,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.LowerCaseFilter; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java index 303c4828b07..6bbb2d83312 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.br; import java.io.IOException; import java.util.Set; -import org.apache.lucene.analysis.KeywordMarkerFilter; // for javadoc +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // for javadoc import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java index fc7b5f82a7f..72044931ee3 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.cz; import org.apache.lucene.analysis.ReusableAnalyzerBase; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java index 01f5823e51d..486d33c5c48 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java @@ -2,7 +2,7 @@ package org.apache.lucene.analysis.cz; import java.io.IOException; -import org.apache.lucene.analysis.KeywordMarkerFilter;// for javadoc +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // for javadoc import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java index ccf0287c764..70990ad9202 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java index a85555e3e38..27696c8792c 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java @@ -29,7 +29,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.LowerCaseFilter; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java index f53e7884be4..dcba092e318 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.de; import java.io.IOException; import java.util.Set; -import org.apache.lucene.analysis.KeywordMarkerFilter;// for javadoc +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // for javadoc import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilter.java index 4aef18df85b..59ccc9ac34a 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilter.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.el; import java.io.IOException; -import org.apache.lucene.analysis.KeywordMarkerFilter; // for javadoc +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // for javadoc import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java index 7a42efc788b..b326816b418 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java @@ -22,7 +22,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java index 19425b9597e..e4bbd453484 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java index 515919673d4..95896776e90 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java index dd2d8b9d8b8..f68c5c2cb10 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java @@ -20,7 +20,7 @@ package org.apache.lucene.analysis.fr; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.LowerCaseFilter; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java index 2e820f5aa06..fa61deae642 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.fr; * limitations under the License. */ -import org.apache.lucene.analysis.KeywordMarkerFilter;// for javadoc +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // for javadoc import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.snowball.SnowballFilter; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java index 844e976d056..2da7ed8a1cd 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java index d634e281b99..cad610b561d 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.hi; import java.io.IOException; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // javadoc @link import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java index a171b1e109e..10c8f734027 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java index ed1271efd54..6d0b783bcb3 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java @@ -22,7 +22,7 @@ import java.io.Reader; import java.util.Set; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java index 63b1fe6965a..2bb51f96fb0 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/lucene/src/java/org/apache/lucene/analysis/KeywordMarkerFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java similarity index 93% rename from lucene/src/java/org/apache/lucene/analysis/KeywordMarkerFilter.java rename to modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java index ed56bb870fa..113924bd5d7 100644 --- a/lucene/src/java/org/apache/lucene/analysis/KeywordMarkerFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java @@ -1,4 +1,4 @@ -package org.apache.lucene.analysis; +package org.apache.lucene.analysis.miscellaneous; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -20,6 +20,9 @@ package org.apache.lucene.analysis; import java.io.IOException; import java.util.Set; +import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.util.Version; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java index 8f0b1d3c9f0..65db885116f 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java @@ -19,7 +19,7 @@ package org.apache.lucene.analysis.nl; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.ReusableAnalyzerBase; import org.apache.lucene.analysis.StopFilter; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java index 0cea6d124e7..65ab9cbec32 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchStemFilter.java @@ -23,7 +23,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.KeywordMarkerFilter;// for javadoc +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // for javadoc import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.snowball.SnowballFilter; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java index ae31a66ab31..fcf3042eb8d 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java index 28ba1c11d81..4a521c8f1e3 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java index ecef4901ca4..e065525a433 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java index 576eb5f86bf..7d59b850559 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java @@ -29,7 +29,7 @@ import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java index 7b378688802..3cdb5d208f3 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianStemFilter.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.ru; * limitations under the License. */ -import org.apache.lucene.analysis.KeywordMarkerFilter;// for javadoc +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; // for javadoc import org.apache.lucene.analysis.LowerCaseFilter; // for javadoc import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java index 95d4bd95a54..49653c77755 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java b/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java index c1a728b78d7..b0d9a4750d4 100644 --- a/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java +++ b/modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java index 6d14420ef20..9c4247b8f4f 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java @@ -22,7 +22,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; /** * Test the Arabic Normalization Filter diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java index 0aecca065b8..e01bcbde966 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java @@ -22,7 +22,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.WhitespaceTokenizer; import org.apache.lucene.util.Version; diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java index a1c2e0f4500..6b4d31ca3ec 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseTokenizer; /** diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java index 4fe97be790d..d2e9b522c73 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java @@ -22,7 +22,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.WhitespaceTokenizer; /** diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java index 6d33ca6a2ce..8b85b27ef85 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseTokenizer; import org.apache.lucene.util.Version; diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java index a14ec8f1af2..613f540e778 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java @@ -26,7 +26,7 @@ import java.util.zip.ZipFile; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.KeywordTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; diff --git a/lucene/src/test/org/apache/lucene/analysis/TestKeywordMarkerFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java similarity index 90% rename from lucene/src/test/org/apache/lucene/analysis/TestKeywordMarkerFilter.java rename to modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java index 4f4ced45dd6..b24112b0b9c 100644 --- a/lucene/src/test/org/apache/lucene/analysis/TestKeywordMarkerFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java @@ -1,4 +1,4 @@ -package org.apache.lucene.analysis; +package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; import java.io.StringReader; @@ -6,6 +6,11 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.WhitespaceTokenizer; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.junit.Test; diff --git a/modules/analysis/smartcn/build.xml b/modules/analysis/smartcn/build.xml index 08da6cf9dec..a793dcd9b44 100644 --- a/modules/analysis/smartcn/build.xml +++ b/modules/analysis/smartcn/build.xml @@ -48,7 +48,7 @@ - Misc building dependency ${analyzers-common.jar} + Smartcn building dependency ${analyzers-common.jar} diff --git a/modules/analysis/stempel/build.xml b/modules/analysis/stempel/build.xml index 07f708f8816..513979117a9 100644 --- a/modules/analysis/stempel/build.xml +++ b/modules/analysis/stempel/build.xml @@ -28,6 +28,14 @@ + + + + + + + @@ -35,4 +43,11 @@ + + + + + Stempel building dependency ${analyzers-common.jar} + + diff --git a/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java b/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java index 9f6c0a4d27a..5617612766c 100644 --- a/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java +++ b/modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java @@ -26,7 +26,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.LowerCaseFilter; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.StopwordAnalyzerBase; diff --git a/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java b/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java index 737c0d29ab5..d504841dcfe 100644 --- a/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java +++ b/solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.snowball.SnowballFilter; diff --git a/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java b/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java index 00393c4ba4a..cc28c2f79d6 100644 --- a/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java +++ b/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java @@ -3,7 +3,7 @@ package org.apache.solr.analysis; import java.io.IOException; import org.apache.lucene.analysis.CharArraySet; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; diff --git a/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java b/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java index 29b64ca2bfa..53d3c2d3b09 100644 --- a/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java +++ b/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java @@ -19,7 +19,7 @@ package org.apache.solr.analysis; import java.util.Map; import java.io.IOException; -import org.apache.lucene.analysis.KeywordMarkerFilter; +import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.CharArraySet;