Index: solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (revision 948195) +++ solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (working copy) @@ -19,10 +19,10 @@ import java.io.IOException; import java.util.Set; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.commongrams.CommonGramsFilter; import org.apache.lucene.analysis.core.StopAnalyzer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; Index: solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java (working copy) @@ -17,11 +17,11 @@ package org.apache.solr.analysis; -import org.apache.lucene.analysis.CharArraySet; 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; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; Index: solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (revision 948195) +++ solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (working copy) @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.StopFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; Index: solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import java.io.IOException; import java.util.ArrayList; Index: solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (working copy) @@ -20,8 +20,8 @@ import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.miscellaneous.KeepWordFilter; +import org.apache.lucene.analysis.util.CharArraySet; import java.util.Set; import java.io.IOException; Index: solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java (working copy) @@ -2,8 +2,8 @@ import java.io.IOException; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; Index: solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (working copy) @@ -21,8 +21,9 @@ import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.fr.*; +import org.apache.lucene.analysis.util.CharArraySet; + import java.io.IOException; import org.apache.lucene.analysis.TokenStream; Index: solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (working copy) @@ -18,12 +18,13 @@ package org.apache.solr.analysis; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.compound.*; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.solr.util.plugin.ResourceLoaderAware; import org.apache.solr.common.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.lucene.analysis.TokenStream; + import java.util.Map; import java.io.IOException; Index: solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (revision 948195) +++ solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (working copy) @@ -20,11 +20,11 @@ import java.util.Map; import java.util.Set; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.commongrams.CommonGramsFilter; import org.apache.lucene.analysis.commongrams.CommonGramsQueryFilter; import org.apache.lucene.analysis.core.StopAnalyzer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; Index: solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java (working copy) @@ -17,8 +17,8 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.solr.util.plugin.ResourceLoaderAware; import org.apache.solr.common.ResourceLoader; Index: solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java (working copy) @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.List; -import org.apache.lucene.analysis.CharArrayMap; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter; +import org.apache.lucene.analysis.util.CharArrayMap; import org.apache.solr.common.ResourceLoader; import org.apache.solr.common.util.StrUtils; import org.apache.solr.util.plugin.ResourceLoaderAware; Index: solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (revision 948167) +++ solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (working copy) @@ -22,8 +22,8 @@ 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; import org.apache.lucene.analysis.snowball.SnowballFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; import org.tartarus.snowball.SnowballProgram; Index: solr/src/java/org/apache/solr/analysis/StopFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/StopFilterFactory.java (revision 948195) +++ solr/src/java/org/apache/solr/analysis/StopFilterFactory.java (working copy) @@ -20,9 +20,9 @@ import org.apache.solr.common.ResourceLoader; import org.apache.solr.util.plugin.ResourceLoaderAware; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.StopAnalyzer; import org.apache.lucene.analysis.core.StopFilter; +import org.apache.lucene.analysis.util.CharArraySet; import java.util.Map; import java.util.Set; Index: modules/analysis/CHANGES.txt =================================================================== --- modules/analysis/CHANGES.txt (revision 948195) +++ modules/analysis/CHANGES.txt (working copy) @@ -51,9 +51,12 @@ - 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.CharFilter -> o.a.l.analysis.charfilter.CharFilter - 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 + - o.a.l.analysis.CharArraySet -> o.a.l.analysis.util.CharArraySet + - o.a.l.analysis.CharArrayMap -> o.a.l.analysis.util.CharArrayMap - o.a.l.analysis.ReusableAnalyzerBase -> o.a.l.analysis.util.ReusableAnalyzerBase - o.a.l.analysis.StopwordAnalyzerBase -> o.a.l.analysis.util.StopwordAnalyzerBase - o.a.l.analysis.WordListLoader -> o.a.l.analysis.util.WordListLoader Index: modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestCharFilter.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestCharFilter.java (revision 948167) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestCharFilter.java (working copy) @@ -15,10 +15,13 @@ * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.analysis.charfilter; import java.io.StringReader; +import org.apache.lucene.analysis.CharReader; +import org.apache.lucene.analysis.CharStream; +import org.apache.lucene.analysis.charfilter.CharFilter; import org.apache.lucene.util.LuceneTestCase; public class TestCharFilter extends LuceneTestCase { Index: modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java (working copy) @@ -21,9 +21,9 @@ import java.io.StringReader; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java (revision 948167) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java (working copy) @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java (working copy) @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseTokenizer; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; public class TestGermanAnalyzer extends BaseTokenStreamTestCase { Index: modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.analysis.Analyzer; 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.Token; @@ -30,6 +29,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.junit.Test; import java.io.IOException; Index: modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java (working copy) @@ -7,12 +7,12 @@ 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.core.WhitespaceTokenizer; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.junit.Test; /** Index: modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java (working copy) @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseTokenizer; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; /** * Test the Brazilian Stem Filter, which only modifies the term text. Index: modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java (revision 948167) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java (working copy) @@ -20,7 +20,7 @@ import java.io.IOException; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java (revision 948167) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java (working copy) @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java (revision 948167) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java (working copy) @@ -26,9 +26,9 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.TermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java (revision 948167) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java (working copy) @@ -21,8 +21,8 @@ import java.io.StringReader; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; /** * Test the Arabic Normalization Filter Index: modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java (revision 948167) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java (working copy) @@ -23,7 +23,7 @@ import java.util.Set; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.util.CharArraySet; /** * Test the Arabic Analyzer Index: modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java (working copy) @@ -25,10 +25,10 @@ import java.util.zip.ZipFile; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; Index: modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (revision 948167) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (working copy) @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java (working copy) @@ -21,9 +21,9 @@ import java.io.StringReader; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; /** * Test the Czech Stemmer. Index: modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.analysis; +package org.apache.lucene.analysis.util; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -25,6 +25,7 @@ import java.util.Set; import java.util.Iterator; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java (revision 948195) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java (working copy) @@ -15,9 +15,12 @@ * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.analysis.util; import java.util.*; + +import org.apache.lucene.analysis.util.CharArrayMap; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java (working copy) @@ -13,13 +13,13 @@ import java.util.Arrays; 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.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /* Index: modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/CharFilter.java (working copy) @@ -15,10 +15,13 @@ * limitations under the License. */ -package org.apache.lucene.analysis; +package org.apache.lucene.analysis.charfilter; import java.io.IOException; +import org.apache.lucene.analysis.CharStream; +import org.apache.lucene.analysis.Tokenizer; + /** * Subclasses of CharFilter can be chained to filter CharStream. * They can be used as {@link java.io.Reader} with additional offset Index: modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java (working copy) @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; -import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.CharStream; /** Index: modules/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java (working copy) @@ -23,7 +23,6 @@ import java.util.LinkedList; import java.util.Set; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; @@ -33,6 +32,7 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.TermAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java (working copy) @@ -68,7 +68,7 @@ * Creates a new {@link DictionaryCompoundWordTokenFilter} * * @param input the {@link TokenStream} to process - * @param dictionary the word dictionary to match against. If this is a {@link org.apache.lucene.analysis.CharArraySet CharArraySet} it must have set ignoreCase=false and only contain + * @param dictionary the word dictionary to match against. If this is a {@link org.apache.lucene.analysis.util.CharArraySet CharArraySet} it must have set ignoreCase=false and only contain * lower case strings. * @deprecated use {@link #DictionaryCompoundWordTokenFilter(Version, TokenStream, Set)} instead */ @@ -81,7 +81,7 @@ * Creates a new {@link DictionaryCompoundWordTokenFilter} * * @param input the {@link TokenStream} to process - * @param dictionary the word dictionary to match against. If this is a {@link org.apache.lucene.analysis.CharArraySet CharArraySet} it must have set ignoreCase=false and only contain + * @param dictionary the word dictionary to match against. If this is a {@link org.apache.lucene.analysis.util.CharArraySet CharArraySet} it must have set ignoreCase=false and only contain * lower case strings. * @param minWordSize only words longer than this get processed * @param minSubwordSize only subwords longer than this get to the output stream @@ -151,7 +151,7 @@ * the {@link TokenStream} to process * @param dictionary * the word dictionary to match against. If this is a - * {@link org.apache.lucene.analysis.CharArraySet CharArraySet} it + * {@link org.apache.lucene.analysis.util.CharArraySet CharArraySet} it * must have set ignoreCase=false and only contain lower case * strings. */ @@ -171,7 +171,7 @@ * the {@link TokenStream} to process * @param dictionary * the word dictionary to match against. If this is a - * {@link org.apache.lucene.analysis.CharArraySet CharArraySet} it + * {@link org.apache.lucene.analysis.util.CharArraySet CharArraySet} it * must have set ignoreCase=false and only contain lower case * strings. * @param minWordSize Index: modules/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java (working copy) @@ -108,7 +108,7 @@ * the hyphenation pattern tree to use for hyphenation * @param dictionary * the word dictionary to match against. If this is a - * {@link org.apache.lucene.analysis.CharArraySet CharArraySet} it + * {@link org.apache.lucene.analysis.util.CharArraySet CharArraySet} it * must have set ignoreCase=false and only contain lower case * strings. */ @@ -132,7 +132,7 @@ * the hyphenation pattern tree to use for hyphenation * @param dictionary * the word dictionary to match against. If this is a - * {@link org.apache.lucene.analysis.CharArraySet CharArraySet} it + * {@link org.apache.lucene.analysis.util.CharArraySet CharArraySet} it * must have set ignoreCase=false and only contain lower case * strings. * @param minWordSize @@ -222,7 +222,7 @@ * * @param input the {@link TokenStream} to process * @param hyphenator the hyphenation pattern tree to use for hyphenation - * @param dictionary the word dictionary to match against. If this is a {@link org.apache.lucene.analysis.CharArraySet CharArraySet} it must have set ignoreCase=false and only contain + * @param dictionary the word dictionary to match against. If this is a {@link org.apache.lucene.analysis.util.CharArraySet CharArraySet} it must have set ignoreCase=false and only contain * lower case strings. * @deprecated use {@link #HyphenationCompoundWordTokenFilter(Version, TokenStream, HyphenationTree, Set)} instead. */ @@ -238,7 +238,7 @@ * * @param input the {@link TokenStream} to process * @param hyphenator the hyphenation pattern tree to use for hyphenation - * @param dictionary the word dictionary to match against. If this is a {@link org.apache.lucene.analysis.CharArraySet CharArraySet} it must have set ignoreCase=false and only contain + * @param dictionary the word dictionary to match against. If this is a {@link org.apache.lucene.analysis.util.CharArraySet CharArraySet} it must have set ignoreCase=false and only contain * lower case strings. * @param minWordSize only words longer than this get processed * @param minSubwordSize only subwords longer than this get to the output Index: modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java (working copy) @@ -23,7 +23,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java (working copy) @@ -27,7 +27,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -37,6 +36,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java (working copy) @@ -24,8 +24,8 @@ import java.util.Set; import java.util.List; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java (working copy) @@ -22,11 +22,11 @@ import java.util.Set; import java.util.List; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.queryParser.QueryParser; // for javadoc import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java (working copy) @@ -21,8 +21,8 @@ import java.io.Reader; import java.util.Set; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java (working copy) @@ -19,11 +19,11 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.RamUsageEstimator; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java (working copy) @@ -17,11 +17,11 @@ package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; import java.io.IOException; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java (working copy) @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Map; -import org.apache.lucene.analysis.CharArrayMap; 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.TermAttribute; +import org.apache.lucene.analysis.util.CharArrayMap; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java (working copy) @@ -27,12 +27,12 @@ import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.StopAnalyzer; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.TermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java (working copy) @@ -19,8 +19,8 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import java.io.IOException; import java.util.Set; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java (working copy) @@ -20,11 +20,11 @@ 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.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java (working copy) @@ -27,7 +27,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -36,6 +35,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java (working copy) @@ -21,10 +21,10 @@ import java.util.Set; import java.util.Arrays; import org.apache.lucene.analysis.standard.StandardTokenizer; // for javadocs -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.tokenattributes.TermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java (working copy) @@ -18,7 +18,6 @@ */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -28,6 +27,7 @@ import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; // for javadoc +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java (working copy) @@ -18,7 +18,6 @@ */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -29,6 +28,7 @@ import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; // for javadoc +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.util.Version; import org.tartarus.snowball.ext.RomanianStemmer; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballAnalyzer.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.standard.*; import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; import java.io.IOException; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.TokenStream; @@ -30,6 +29,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.util.Version; import org.tartarus.snowball.ext.TurkishStemmer; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java (working copy) @@ -24,10 +24,10 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.analysis.core.LowerCaseFilter; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java (working copy) @@ -21,7 +21,6 @@ import java.io.Reader; import java.util.Set; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -29,6 +28,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/cn/ChineseFilter.java (working copy) @@ -20,11 +20,11 @@ import java.io.IOException; import java.util.Arrays; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.tokenattributes.TermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; /** Index: modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemmer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemmer.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemmer.java (working copy) @@ -1,6 +1,6 @@ package org.apache.lucene.analysis.el; -import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.Version; import java.util.Arrays; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java (working copy) @@ -24,10 +24,10 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.analysis.TokenStream; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java (working copy) @@ -21,7 +21,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -30,6 +29,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java (working copy) @@ -18,9 +18,9 @@ */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.StopFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java (working copy) @@ -22,7 +22,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -31,6 +30,7 @@ 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.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java (working copy) @@ -18,7 +18,6 @@ */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -26,6 +25,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java (revision 948167) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java (working copy) @@ -17,8 +17,8 @@ package org.apache.lucene.analysis.synonym; -import org.apache.lucene.analysis.CharArrayMap; import org.apache.lucene.analysis.Token; +import org.apache.lucene.analysis.util.CharArrayMap; import org.apache.lucene.util.Version; import java.util.*; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java (working copy) @@ -20,7 +20,6 @@ import java.io.IOException; import java.util.Set; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharArraySet.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharArraySet.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharArraySet.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.analysis; +package org.apache.lucene.analysis.util; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -24,6 +24,7 @@ import org.apache.lucene.util.Version; + /** * A simple class that stores Strings as char[]'s in a * hash table. Note that this is not a general purpose Index: modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java (revision 948195) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.lucene.analysis; +package org.apache.lucene.analysis.util; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -27,6 +27,7 @@ import org.apache.lucene.util.CharacterUtils; import org.apache.lucene.util.Version; + /** * A simple class that stores key Strings as char[]'s in a * hash table. Note that this is not a general purpose Index: modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java =================================================================== --- modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java (revision 948195) +++ modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java (working copy) @@ -25,7 +25,6 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; @@ -35,6 +34,7 @@ import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.stempel.StempelStemmer; import org.apache.lucene.analysis.stempel.StempelFilter; +import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; Index: lucene/src/test/org/apache/lucene/analysis/TestCharFilter.java (deleted) =================================================================== Index: lucene/src/test/org/apache/lucene/analysis/TestCharArraySet.java (deleted) =================================================================== Index: lucene/src/test/org/apache/lucene/analysis/TestCharArrayMap.java (deleted) =================================================================== Index: lucene/src/java/org/apache/lucene/analysis/CharArrayMap.java (deleted) =================================================================== Index: lucene/src/java/org/apache/lucene/analysis/CharFilter.java (deleted) =================================================================== Index: lucene/src/java/org/apache/lucene/analysis/CharArraySet.java (deleted) ===================================================================