Index: solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java (revision 1332037) +++ solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java (working copy) @@ -25,6 +25,8 @@ import java.util.Map; import org.apache.lucene.analysis.Token; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.analysis.util.ResourceLoader; Index: solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java (revision 1332037) +++ solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java (working copy) @@ -18,6 +18,7 @@ import org.apache.lucene.analysis.NumericTokenStream; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; import org.junit.Test; Index: solr/core/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java (revision 1332037) +++ solr/core/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java (working copy) @@ -17,6 +17,7 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.util.LuceneTestCase; public class TestMappingCharFilterFactory extends LuceneTestCase { Index: solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java (revision 1332037) +++ solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java (working copy) @@ -18,6 +18,8 @@ import java.lang.reflect.Field; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.Config; import org.apache.solr.schema.IndexSchema; @@ -48,13 +50,13 @@ FieldType type = schema.getFieldType("textDefault"); TokenizerChain ana = (TokenizerChain) type.getAnalyzer(); - assertEquals(DEFAULT_VERSION, ((BaseTokenizerFactory) ana.getTokenizerFactory()).luceneMatchVersion); - assertEquals(DEFAULT_VERSION, ((BaseTokenFilterFactory) ana.getTokenFilterFactories()[2]).luceneMatchVersion); + assertEquals(DEFAULT_VERSION, ((BaseTokenizerFactory) ana.getTokenizerFactory()).getLuceneMatchVersion()); + assertEquals(DEFAULT_VERSION, ((BaseTokenFilterFactory) ana.getTokenFilterFactories()[2]).getLuceneMatchVersion()); type = schema.getFieldType("text30"); ana = (TokenizerChain) type.getAnalyzer(); - assertEquals(Version.LUCENE_30, ((BaseTokenizerFactory) ana.getTokenizerFactory()).luceneMatchVersion); - assertEquals(Version.LUCENE_31, ((BaseTokenFilterFactory) ana.getTokenFilterFactories()[2]).luceneMatchVersion); + assertEquals(Version.LUCENE_30, ((BaseTokenizerFactory) ana.getTokenizerFactory()).getLuceneMatchVersion()); + assertEquals(Version.LUCENE_31, ((BaseTokenFilterFactory) ana.getTokenFilterFactories()[2]).getLuceneMatchVersion()); // this is a hack to get the private matchVersion field in StandardAnalyzer's superclass, may break in later lucene versions - we have no getter :( final Field matchVersionField = StandardAnalyzer.class.getSuperclass().getDeclaredField("matchVersion"); Index: solr/core/src/test/org/apache/solr/schema/MultiTermTest.java =================================================================== --- solr/core/src/test/org/apache/solr/schema/MultiTermTest.java (revision 1332037) +++ solr/core/src/test/org/apache/solr/schema/MultiTermTest.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.factory.TokenFilterFactory; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.analysis.*; import org.junit.BeforeClass; Index: solr/core/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java (working copy) @@ -23,6 +23,8 @@ import java.util.regex.Pattern; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.pattern.PatternTokenizer; @@ -63,7 +65,7 @@ * @since solr1.2 * */ -public class PatternTokenizerFactory extends BaseTokenizerFactory +public class PatternTokenizerFactory extends BaseTokenizerFactory { public static final String PATTERN = "pattern"; public static final String GROUP = "group"; Index: solr/core/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.pt.PortugueseMinimalStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (working copy) @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.lucene.analysis.cn.ChineseTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: solr/core/src/java/org/apache/solr/analysis/JapaneseBaseFormFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/JapaneseBaseFormFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/JapaneseBaseFormFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.ja.JapaneseBaseFormFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.standard.ClassicTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import java.io.Reader; Index: solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.gl.GalicianMinimalStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java (working copy) @@ -19,6 +19,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cjk.CJKWidthFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; /** * Factory for {@link CJKWidthFilter}. Index: solr/core/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java (working copy) @@ -21,6 +21,8 @@ import org.apache.lucene.analysis.fa.PersianNormalizationFilter; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; /** * Factory for {@link PersianNormalizationFilter}. Index: solr/core/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java (working copy) @@ -17,6 +17,8 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.pattern.PatternReplaceFilter; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter; /** @@ -32,7 +33,7 @@ * </fieldType> * */ -public class DoubleMetaphoneFilterFactory extends BaseTokenFilterFactory +public class DoubleMetaphoneFilterFactory extends BaseTokenFilterFactory { public static final String INJECT = "inject"; public static final String MAX_CODE_LENGTH = "maxCodeLength"; Index: solr/core/src/java/org/apache/solr/analysis/TrimFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/TrimFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/TrimFilterFactory.java (working copy) @@ -20,6 +20,8 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.miscellaneous.TrimFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.EnglishPossessiveFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link EnglishPossessiveFilter}. Index: solr/core/src/java/org/apache/solr/analysis/CharFilterFactory.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java (working copy) @@ -20,6 +20,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.id.IndonesianStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/TokenFilterFactory.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (working copy) @@ -21,6 +21,8 @@ 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.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; Index: solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.fr.FrenchLightStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java (working copy) @@ -33,6 +33,10 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.WhitespaceTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.FactoryUtils; +import org.apache.lucene.analysis.factory.InitializationException; +import org.apache.lucene.analysis.factory.TokenizerFactory; import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.analysis.synonym.SynonymMap; import org.apache.lucene.analysis.synonym.SolrSynonymParser; @@ -121,7 +125,7 @@ decoder.reset(); parser.add(new InputStreamReader(loader.openResource(synonyms), decoder)); } else { - List files = StrUtils.splitFileNames(synonyms); + List files = FactoryUtils.splitFileNames(synonyms); for (String file : files) { decoder.reset(); parser.add(new InputStreamReader(loader.openResource(file), decoder)); @@ -149,7 +153,7 @@ decoder.reset(); parser.add(new InputStreamReader(loader.openResource(synonyms), decoder)); } else { - List files = StrUtils.splitFileNames(synonyms); + List files = FactoryUtils.splitFileNames(synonyms); for (String file : files) { decoder.reset(); parser.add(new InputStreamReader(loader.openResource(file), decoder)); Index: solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.reverse.ReverseStringFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanLightStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link GermanLightStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java (working copy) @@ -20,6 +20,8 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.cjk.CJKTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; + import java.io.Reader; /** Index: solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.bg.BulgarianStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link BulgarianStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java (working copy) @@ -26,6 +26,9 @@ import org.apache.commons.io.IOUtils; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.collation.CollationKeyFilter; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; Index: solr/core/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.it.ItalianLightStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java (working copy) @@ -18,6 +18,8 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.hi.HindiNormalizationFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java (working copy) @@ -22,6 +22,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.el.GreekLowerCaseFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; /** * Factory for {@link GreekLowerCaseFilter}. Index: solr/core/src/java/org/apache/solr/analysis/NGramFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/NGramFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/NGramFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.ngram.NGramTokenFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/PositionFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PositionFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PositionFilterFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.position.PositionFilter; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java (working copy) @@ -20,6 +20,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.br.BrazilianStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link BrazilianStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.fr.FrenchMinimalStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/InitializationException.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java (working copy) @@ -18,8 +18,8 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.HyphenatedWordsFilter; -import org.apache.solr.analysis.BaseTokenFilterFactory; /** * Factory for {@link HyphenatedWordsFilter}. Index: solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanMinimalStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link GermanMinimalStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java (working copy) @@ -19,6 +19,8 @@ import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.core.LowerCaseTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import java.io.Reader; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java (working copy) @@ -27,6 +27,8 @@ import java.util.Map; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.ja.JapaneseTokenizer; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; import org.apache.lucene.analysis.ja.dict.UserDictionary; Index: solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java (working copy) @@ -20,6 +20,8 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.util.Version; import org.apache.lucene.analysis.util.ResourceLoader; Index: solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java (working copy) @@ -18,6 +18,9 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.*; +import org.apache.lucene.analysis.factory.CharFilterFactory; +import org.apache.lucene.analysis.factory.TokenFilterFactory; +import org.apache.lucene.analysis.factory.TokenizerFactory; import java.io.IOException; import java.io.Reader; Index: solr/core/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java (working copy) @@ -20,6 +20,8 @@ import java.util.Map; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.path.PathHierarchyTokenizer; import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer; Index: solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/LengthFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/LengthFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/LengthFilterFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.LengthFilter; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.th.ThaiWordFilter; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java (working copy) @@ -19,6 +19,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.TypeTokenFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.FactoryUtils; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; import org.apache.lucene.analysis.util.ResourceLoaderAware; @@ -48,7 +51,7 @@ useWhitelist = getBoolean("useWhitelist", false); if (stopTypesFiles != null) { try { - List files = StrUtils.splitFileNames(stopTypesFiles); + List files = FactoryUtils.splitFileNames(stopTypesFiles); if (files.size() > 0) { stopTypes = new HashSet(); for (String file : files) { Index: solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java (working copy) @@ -22,6 +22,8 @@ import java.util.List; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.hunspell.HunspellDictionary; import org.apache.lucene.analysis.hunspell.HunspellStemFilter; import org.apache.lucene.analysis.util.ResourceLoader; Index: solr/core/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.pt.PortugueseLightStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.hi.HindiStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.es.SpanishLightStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link SpanishLightStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.lv.LatvianStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.sv.SwedishLightStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java (working copy) @@ -20,6 +20,7 @@ +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer; Index: solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.EnglishMinimalStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link EnglishMinimalStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java (working copy) @@ -27,6 +27,10 @@ import org.apache.lucene.analysis.CharStream; import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; +import org.apache.lucene.analysis.factory.BaseCharFilterFactory; +import org.apache.lucene.analysis.factory.FactoryUtils; +import org.apache.lucene.analysis.factory.InitializationException; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; import org.apache.lucene.analysis.util.ResourceLoaderAware; @@ -62,7 +66,7 @@ wlist = loader.getLines( mapping ); } else{ - List files = StrUtils.splitFileNames( mapping ); + List files = FactoryUtils.splitFileNames(mapping); wlist = new ArrayList(); for( String file : files ){ List lines = loader.getLines( file.trim() ); Index: solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java (working copy) @@ -20,6 +20,8 @@ import java.io.Reader; import java.util.Map; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.ru.RussianLetterTokenizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java (working copy) @@ -18,6 +18,8 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.pt.PortugueseStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java (working copy) @@ -18,6 +18,8 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.in.IndicNormalizationFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.analysis.de.GermanStemFilter; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link GermanStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java (working copy) @@ -19,6 +19,7 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.payloads.TokenOffsetPayloadTokenFilter; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.PorterStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link PorterStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/TokenizerFactory.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java (working copy) @@ -22,6 +22,8 @@ import java.util.regex.PatternSyntaxException; import org.apache.lucene.analysis.CharStream; +import org.apache.lucene.analysis.factory.BaseCharFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.core.KeywordTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import java.io.Reader; Index: solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** @@ -32,7 +33,7 @@ * </fieldType> * */ -public class ArabicStemFilterFactory extends BaseTokenFilterFactory{ +public class ArabicStemFilterFactory extends BaseTokenFilterFactory { public ArabicStemFilter create(TokenStream input) { Index: solr/core/src/java/org/apache/solr/analysis/JapaneseKatakanaStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/JapaneseKatakanaStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/JapaneseKatakanaStemFilterFactory.java (working copy) @@ -18,6 +18,8 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.ja.JapaneseKatakanaStemFilter; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.CapitalizationFilter; import org.apache.lucene.analysis.util.CharArraySet; Index: solr/core/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java (working copy) @@ -19,6 +19,7 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.payloads.NumericPayloadTokenFilter; import org.apache.lucene.analysis.TokenStream; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (working copy) @@ -17,6 +17,8 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java (working copy) @@ -19,6 +19,7 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.payloads.TypeAsPayloadTokenFilter; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.standard.ClassicFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/IrishLowerCaseFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/IrishLowerCaseFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/IrishLowerCaseFilterFactory.java (working copy) @@ -18,6 +18,8 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.ga.IrishLowerCaseFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.core.LetterTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import java.io.Reader; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java (working copy) @@ -21,6 +21,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.LowerCaseFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; /** * Factory for {@link LowerCaseFilter}. Index: solr/core/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java (working copy) @@ -17,6 +17,7 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardTokenizer; Index: solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java (working copy) @@ -2,6 +2,8 @@ import java.io.IOException; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java (working copy) @@ -20,6 +20,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/ShingleFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ShingleFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ShingleFilterFactory.java (working copy) @@ -19,6 +19,8 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.shingle.ShingleFilter; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.hu.HungarianLightStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java (working copy) @@ -18,6 +18,8 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; /** @@ -31,7 +33,7 @@ * </fieldType> * */ -public class TurkishLowerCaseFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent { +public class TurkishLowerCaseFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent { public TokenStream create(TokenStream input) { return new TurkishLowerCaseFilter(input); } Index: solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java (working copy) @@ -22,6 +22,8 @@ import java.util.Set; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.ResourceLoader; Index: solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.gl.GalicianStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (working copy) @@ -19,6 +19,8 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.lucene.analysis.fr.*; Index: solr/core/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.reverse.ReverseStringFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/JapaneseReadingFormFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/JapaneseReadingFormFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/JapaneseReadingFormFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.ja.JapaneseReadingFormFilter; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.ru.RussianLightStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (working copy) @@ -19,6 +19,8 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.compound.*; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.lucene.analysis.util.ResourceLoader; @@ -39,7 +41,7 @@ * </fieldType> * */ -public class DictionaryCompoundWordTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware { +public class DictionaryCompoundWordTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware { private CharArraySet dictionary; private String dictFile; private int minWordSize; Index: solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (working copy) @@ -23,6 +23,8 @@ 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.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; Index: solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java (working copy) @@ -19,6 +19,7 @@ */ import org.apache.lucene.analysis.CharStream; +import org.apache.lucene.analysis.factory.BaseCharFilterFactory; /** * Factory for {@link LegacyHTMLStripCharFilter}. Index: solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java (working copy) @@ -32,6 +32,8 @@ import org.apache.commons.codec.language.RefinedSoundex; import org.apache.commons.codec.language.Soundex; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.phonetic.PhoneticFilter; /** @@ -57,7 +59,7 @@ * * @see PhoneticFilter */ -public class PhoneticFilterFactory extends BaseTokenFilterFactory +public class PhoneticFilterFactory extends BaseTokenFilterFactory { public static final String ENCODER = "encoder"; public static final String INJECT = "inject"; // boolean Index: solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.no.NorwegianLightStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java (working copy) @@ -18,6 +18,9 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.FactoryUtils; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter; import org.apache.lucene.analysis.miscellaneous.WordDelimiterIterator; import org.apache.lucene.analysis.util.CharArraySet; @@ -69,7 +72,7 @@ String types = args.get(TYPES); if (types != null) { try { - List files = StrUtils.splitFileNames( types ); + List files = FactoryUtils.splitFileNames(types); List wlist = new ArrayList(); for( String file : files ){ List lines = loader.getLines( file.trim() ); Index: solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java (working copy) @@ -17,6 +17,8 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.payloads.DelimitedPayloadTokenFilter; import org.apache.lucene.analysis.payloads.PayloadEncoder; import org.apache.lucene.analysis.payloads.FloatEncoder; Index: solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java (working copy) @@ -21,6 +21,9 @@ import java.util.List; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.FactoryUtils; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter; import org.apache.lucene.analysis.util.CharArrayMap; import org.apache.lucene.analysis.util.ResourceLoader; @@ -47,7 +50,7 @@ ignoreCase = getBoolean("ignoreCase", false); if (dictionaryFiles != null) { assureMatchVersion(); - List files = StrUtils.splitFileNames(dictionaryFiles); + List files = FactoryUtils.splitFileNames(dictionaryFiles); try { if (files.size() > 0) { dictionary = new CharArrayMap(luceneMatchVersion, Index: solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (working copy) @@ -19,6 +19,8 @@ import java.util.Map; import java.io.IOException; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cn.ChineseFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java (working copy) @@ -17,6 +17,7 @@ * limitations under the License. */ +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.ngram.EdgeNGramTokenizer; import java.io.Reader; Index: solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.fi.FinnishLightStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/GermanNormalizationFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/GermanNormalizationFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/GermanNormalizationFilterFactory.java (working copy) @@ -19,6 +19,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanNormalizationFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; /** * Factory for {@link GermanNormalizationFilter}. Index: solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java (working copy) @@ -18,6 +18,10 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.FactoryUtils; +import org.apache.lucene.analysis.factory.InitializationException; +import org.apache.lucene.analysis.factory.TokenizerFactory; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; @@ -75,7 +79,7 @@ if (synonymFile.exists()) { wlist = loader.getLines(synonyms); } else { - List files = StrUtils.splitFileNames(synonyms); + List files = FactoryUtils.splitFileNames(synonyms); wlist = new ArrayList(); for (String file : files) { List lines = loader.getLines(file.trim()); Index: solr/core/src/java/org/apache/solr/analysis/SlowSynonymMap.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SlowSynonymMap.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/SlowSynonymMap.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.Token; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.CharArrayMap; import org.apache.lucene.util.Version; Index: solr/core/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java (working copy) @@ -18,6 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.core.WhitespaceTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import java.io.Reader; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/KStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/KStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/KStemFilterFactory.java (working copy) @@ -20,6 +20,7 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.KStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link KStemFilter} Index: solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java (working copy) @@ -20,6 +20,7 @@ import org.apache.lucene.analysis.CharStream; import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter; +import org.apache.lucene.analysis.factory.BaseCharFilterFactory; import java.util.HashSet; import java.util.Map; Index: solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cz.CzechStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link CzechStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java (working copy) @@ -17,6 +17,8 @@ package org.apache.solr.analysis; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.lucene.analysis.TokenStream; Index: solr/core/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.el.GreekStemFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link GreekStemFilter}. Index: solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (working copy) @@ -17,6 +17,7 @@ */ import org.apache.lucene.analysis.ar.ArabicLetterTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,7 @@ * @deprecated (3.1) Use StandardTokenizerFactory instead. **/ @Deprecated -public class ArabicLetterTokenizerFactory extends BaseTokenizerFactory{ +public class ArabicLetterTokenizerFactory extends BaseTokenizerFactory { private static final Logger log = LoggerFactory.getLogger(ArabicLetterTokenizerFactory.class); Index: solr/core/src/java/org/apache/solr/analysis/MultiTermAwareComponent.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java (working copy) @@ -22,8 +22,9 @@ import org.apache.lucene.analysis.compound.CompoundWordTokenFilterBase; import org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter; import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.InitializationException; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.analysis.BaseTokenFilterFactory; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.util.ResourceLoaderAware; Index: solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java (working copy) @@ -18,6 +18,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicNormalizationFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; /** Index: solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java (working copy) @@ -17,6 +17,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.NumericTokenStream; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.Tokenizer; import org.apache.solr.common.SolrException; Index: solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cjk.CJKBigramFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for {@link CJKBigramFilter}. Index: solr/core/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.ngram.NGramTokenizer; import java.io.Reader; Index: solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java (working copy) @@ -18,6 +18,7 @@ */ import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.no.NorwegianMinimalStemFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java (working copy) @@ -20,6 +20,7 @@ import java.io.Reader; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer; /** Index: solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java (working copy) @@ -19,6 +19,8 @@ import org.apache.lucene.analysis.CharStream; import org.apache.lucene.analysis.fa.PersianCharFilter; +import org.apache.lucene.analysis.factory.BaseCharFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; /** * Factory for {@link PersianCharFilter}. Index: solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java (working copy) @@ -26,6 +26,7 @@ import org.apache.commons.codec.language.bm.PhoneticEngine; import org.apache.commons.codec.language.bm.RuleType; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.phonetic.BeiderMorseFilter; /** Index: solr/core/src/java/org/apache/solr/analysis/StandardFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/StandardFilterFactory.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/analysis/StandardFilterFactory.java (working copy) @@ -20,6 +20,7 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.standard.StandardFilter; /** Index: solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java =================================================================== --- solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (working copy) @@ -45,9 +45,9 @@ import javax.naming.NamingException; import javax.naming.NoInitialContextException; -import org.apache.solr.analysis.CharFilterFactory; -import org.apache.solr.analysis.TokenFilterFactory; -import org.apache.solr.analysis.TokenizerFactory; +import org.apache.lucene.analysis.factory.CharFilterFactory; +import org.apache.lucene.analysis.factory.TokenFilterFactory; +import org.apache.lucene.analysis.factory.TokenizerFactory; import org.apache.solr.util.FileUtils; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; Index: solr/core/src/java/org/apache/solr/schema/TrieField.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/TrieField.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/schema/TrieField.java (working copy) @@ -21,6 +21,8 @@ import java.util.Locale; import java.util.Map; +import org.apache.lucene.analysis.factory.CharFilterFactory; +import org.apache.lucene.analysis.factory.TokenFilterFactory; import org.apache.lucene.document.DoubleField; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType.NumericType; Index: solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (working copy) @@ -19,6 +19,10 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.KeywordAnalyzer; +import org.apache.lucene.analysis.factory.CharFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; +import org.apache.lucene.analysis.factory.TokenFilterFactory; +import org.apache.lucene.analysis.factory.TokenizerFactory; import org.apache.lucene.util.Version; import org.apache.solr.analysis.*; import org.apache.lucene.analysis.util.ResourceLoader; Index: solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java =================================================================== --- solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (working copy) @@ -32,6 +32,7 @@ import java.util.Set; import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.factory.TokenFilterFactory; import org.apache.lucene.queries.function.BoostedQuery; import org.apache.lucene.queries.function.FunctionQuery; import org.apache.lucene.queries.function.ValueSource; Index: solr/core/src/java/org/apache/solr/search/SolrQueryParser.java =================================================================== --- solr/core/src/java/org/apache/solr/search/SolrQueryParser.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/search/SolrQueryParser.java (working copy) @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Map.Entry; +import org.apache.lucene.analysis.factory.TokenFilterFactory; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.classic.ParseException; import org.apache.lucene.queryparser.classic.QueryParser; Index: solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java =================================================================== --- solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (working copy) @@ -33,10 +33,10 @@ import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.PriorityQueue; import org.apache.lucene.util.UnicodeUtil; -import org.apache.solr.analysis.CharFilterFactory; -import org.apache.solr.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.factory.CharFilterFactory; +import org.apache.lucene.analysis.factory.TokenFilterFactory; import org.apache.solr.analysis.TokenizerChain; -import org.apache.solr.analysis.TokenizerFactory; +import org.apache.lucene.analysis.factory.TokenizerFactory; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.luke.FieldFlag; Index: solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java =================================================================== --- solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (revision 1332037) +++ solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (working copy) @@ -30,10 +30,10 @@ import org.apache.lucene.util.AttributeReflector; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.ArrayUtil; -import org.apache.solr.analysis.CharFilterFactory; -import org.apache.solr.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.factory.CharFilterFactory; +import org.apache.lucene.analysis.factory.TokenFilterFactory; import org.apache.solr.analysis.TokenizerChain; -import org.apache.solr.analysis.TokenizerFactory; +import org.apache.lucene.analysis.factory.TokenizerFactory; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.common.SolrException; Index: solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java =================================================================== --- solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java (revision 1332037) +++ solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java (working copy) @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.util.CharArraySet; import org.apache.solr.analysis.CommonGramsFilterFactory; import org.apache.solr.analysis.StopFilterFactory; -import org.apache.solr.analysis.TokenFilterFactory; +import org.apache.lucene.analysis.factory.TokenFilterFactory; import org.apache.solr.analysis.TokenizerChain; import org.apache.solr.schema.IndexSchema; import org.carrot2.core.LanguageCode; Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java (working copy) @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.stempel.StempelFilter; import org.apache.lucene.analysis.stempel.StempelStemmer; import org.apache.lucene.analysis.util.ResourceLoader; Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java (working copy) @@ -20,6 +20,7 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cn.smart.WordTokenFilter; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; /** * Factory for the SmartChineseAnalyzer {@link WordTokenFilter} Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java (working copy) @@ -1,6 +1,8 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.icu.ICUFoldingFilter; /** Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java (working copy) @@ -20,6 +20,8 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.icu.ICUNormalizer2Filter; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java (working copy) @@ -20,6 +20,7 @@ import java.io.Reader; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.icu.segmentation.ICUTokenizer; /** Factory for {@link ICUTokenizer} */ Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java (working copy) @@ -25,6 +25,7 @@ import morfologik.stemming.PolishStemmer.DICTIONARY; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; import org.apache.lucene.analysis.morfologik.MorfologikFilter; /** Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java (working copy) @@ -20,8 +20,9 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.analysis.icu.ICUTransformFilter; -import org.apache.solr.analysis.BaseTokenFilterFactory; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java (working copy) @@ -21,6 +21,8 @@ import org.apache.commons.io.IOUtils; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.factory.BaseTokenFilterFactory; +import org.apache.lucene.analysis.factory.MultiTermAwareComponent; import org.apache.lucene.collation.ICUCollationKeyFilter; import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java (revision 1332037) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.cn.smart.SentenceTokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; /** * Factory for the SmartChineseAnalyzer {@link SentenceTokenizer} Index: solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java =================================================================== --- solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java (revision 1332037) +++ solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java (working copy) @@ -18,14 +18,14 @@ */ import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.uima.UIMAAnnotationsTokenizer; -import org.apache.solr.analysis.BaseTokenizerFactory; import java.io.Reader; import java.util.Map; /** - * Solr {@link org.apache.solr.analysis.TokenizerFactory} for {@link UIMAAnnotationsTokenizer} + * Solr {@link org.apache.lucene.analysis.factory.TokenizerFactory} for {@link UIMAAnnotationsTokenizer} */ public class UIMAAnnotationsTokenizerFactory extends BaseTokenizerFactory { Index: solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java =================================================================== --- solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java (revision 1332037) +++ solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java (working copy) @@ -18,14 +18,14 @@ */ import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.analysis.uima.UIMATypeAwareAnnotationsTokenizer; -import org.apache.solr.analysis.BaseTokenizerFactory; import java.io.Reader; import java.util.Map; /** - * Solr {@link org.apache.solr.analysis.TokenizerFactory} for {@link UIMATypeAwareAnnotationsTokenizer} + * Solr {@link org.apache.lucene.analysis.factory.TokenizerFactory} for {@link UIMATypeAwareAnnotationsTokenizer} */ public class UIMATypeAwareAnnotationsTokenizerFactory extends BaseTokenizerFactory { Index: solr/contrib/uima/build.xml =================================================================== --- solr/contrib/uima/build.xml (revision 1332037) +++ solr/contrib/uima/build.xml (working copy) @@ -27,6 +27,7 @@ + @@ -34,11 +35,12 @@ + - + Index: solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java =================================================================== --- solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java (revision 1332037) +++ solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.factory.BaseTokenizerFactory; import org.apache.lucene.util.automaton.CharacterRunAutomaton; /** Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/factory/FactoryUtilsTest.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/factory/FactoryUtilsTest.java (revision 0) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/factory/FactoryUtilsTest.java (revision 0) @@ -0,0 +1,39 @@ +package org.apache.lucene.analysis.factory; + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.junit.Test; + +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class FactoryUtilsTest { + + @Test + public void testSplitFileNames() throws Exception { + List fileNames = FactoryUtils.splitFileNames("/h/s,/h/\\,s,"); + assertEquals(2, fileNames.size()); + assertEquals("/h/s", fileNames.get(0)); + assertEquals("/h/,s", fileNames.get(1)); + + fileNames = FactoryUtils.splitFileNames("/h/s"); + assertEquals(1, fileNames.size()); + assertEquals("/h/s", fileNames.get(0)); + } +} Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/BaseTokenStreamFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/BaseTokenStreamFactory.java (revision 0) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/BaseTokenStreamFactory.java (working copy) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.factory; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.util.CharArraySet; @@ -23,7 +23,6 @@ import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.Version; import org.apache.lucene.analysis.util.ResourceLoader; -import org.apache.solr.common.util.StrUtils; import java.io.IOException; import java.io.InputStream; @@ -31,6 +30,8 @@ import java.io.Reader; import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -69,7 +70,11 @@ public void setLuceneMatchVersion(Version luceneMatchVersion) { this.luceneMatchVersion = luceneMatchVersion; } - + + public Version getLuceneMatchVersion() { + return luceneMatchVersion; + } + // TODO: move these somewhere that tokenizers and others // can also use them... protected int getInt(String name) { @@ -105,7 +110,7 @@ protected CharArraySet getWordSet(ResourceLoader loader, String wordFiles, boolean ignoreCase) throws IOException { assureMatchVersion(); - List files = StrUtils.splitFileNames(wordFiles); + List files = FactoryUtils.splitFileNames(wordFiles); CharArraySet words = null; if (files.size() > 0) { // default stopwords list has 35 or so words, but maybe don't make it that @@ -126,7 +131,7 @@ protected CharArraySet getSnowballWordSet(ResourceLoader loader, String wordFiles, boolean ignoreCase) throws IOException { assureMatchVersion(); - List files = StrUtils.splitFileNames(wordFiles); + List files = FactoryUtils.splitFileNames(wordFiles); CharArraySet words = null; if (files.size() > 0) { // default stopwords list has 35 or so words, but maybe don't make it that Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/TokenizerFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/TokenizerFactory.java (revision 0) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/TokenizerFactory.java (working copy) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.factory; import java.io.*; import java.util.Map; Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/MultiTermAwareComponent.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/MultiTermAwareComponent.java (revision 0) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/MultiTermAwareComponent.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.factory; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/BaseCharFilterFactory.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/BaseCharFilterFactory.java (revision 0) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/BaseCharFilterFactory.java (working copy) @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.factory; import org.apache.lucene.util.Version; Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/InitializationException.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/InitializationException.java (revision 0) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/InitializationException.java (working copy) @@ -1,4 +1,4 @@ -package org.apache.solr.analysis; +package org.apache.lucene.analysis.factory; /* * Licensed to the Apache Software Foundation (ASF) under one or more Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/FactoryUtils.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/FactoryUtils.java (revision 0) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/factory/FactoryUtils.java (revision 0) @@ -0,0 +1,40 @@ +package org.apache.lucene.analysis.factory; + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class FactoryUtils { + + private FactoryUtils() { + } + + public static List splitFileNames(String fileNames) { + if (fileNames == null) + return Collections.emptyList(); + + List result = new ArrayList(); + for (String file : fileNames.split("(?