You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ch...@apache.org on 2012/05/08 05:23:52 UTC
svn commit: r1335331 [1/3] - in /lucene/dev/trunk:
dev-tools/idea/solr/contrib/uima/
lucene/analysis/common/src/java/org/apache/lucene/analysis/util/
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/
solr/contrib/clustering/src/java/org/a...
Author: chrism
Date: Tue May 8 03:23:47 2012
New Revision: 1335331
URL: http://svn.apache.org/viewvc?rev=1335331&view=rev
Log:
LUCENE-2510: Moved Analysis Factory parent classes into analysis module
Added:
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/InitializationException.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java
Removed:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CharFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/InitializationException.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TokenizerFactory.java
Modified:
lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java
lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java
lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanNormalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/IrishLowerCaseFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapaneseBaseFormFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapaneseKatakanaStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapaneseReadingFormFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/KStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/LengthFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/NGramFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/NorwegianLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/NorwegianMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/PositionFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ShingleFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/SlowSynonymMap.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/StandardFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TrimFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/TrieField.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java
Modified: lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/solr/contrib/uima/uima.iml Tue May 8 03:23:47 2012
@@ -27,5 +27,6 @@
<orderEntry type="module" module-name="solr" />
<orderEntry type="module" module-name="lucene" />
<orderEntry type="module" module-name="analysis-uima" />
+ <orderEntry type="module" module-name="analysis-common" />
</component>
</module>
Added: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java?rev=1335331&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java (added)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java Tue May 8 03:23:47 2012
@@ -0,0 +1,168 @@
+package org.apache.lucene.analysis.util;
+
+/*
+ * 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.apache.lucene.analysis.core.StopFilter;
+import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.Version;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+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;
+
+abstract class AbstractAnalysisFactory {
+
+ /** The init args */
+ protected Map<String,String> args;
+
+ /** the luceneVersion arg */
+ protected Version luceneMatchVersion = null;
+
+ public void init(Map<String,String> args) {
+ this.args = args;
+ }
+
+ public Map<String,String> getArgs() {
+ return args;
+ }
+
+ /** this method can be called in the {@link org.apache.lucene.analysis.util.TokenizerFactory#create(java.io.Reader)}
+ * or {@link org.apache.lucene.analysis.util.TokenFilterFactory#create(org.apache.lucene.analysis.TokenStream)} methods,
+ * to inform user, that for this factory a {@link #luceneMatchVersion} is required */
+ protected final void assureMatchVersion() {
+ if (luceneMatchVersion == null) {
+ throw new InitializationException("Configuration Error: Factory '" + this.getClass().getName() +
+ "' needs a 'luceneMatchVersion' parameter");
+ }
+ }
+
+ public void setLuceneMatchVersion(Version luceneMatchVersion) {
+ this.luceneMatchVersion = luceneMatchVersion;
+ }
+
+ public Version getLuceneMatchVersion() {
+ return this.luceneMatchVersion;
+ }
+
+ protected int getInt(String name) {
+ return getInt(name, -1, false);
+ }
+
+ protected int getInt(String name, int defaultVal) {
+ return getInt(name, defaultVal, true);
+ }
+
+ protected int getInt(String name, int defaultVal, boolean useDefault) {
+ String s = args.get(name);
+ if (s == null) {
+ if (useDefault) {
+ return defaultVal;
+ }
+ throw new InitializationException("Configuration Error: missing parameter '" + name + "'");
+ }
+ return Integer.parseInt(s);
+ }
+
+ protected boolean getBoolean(String name, boolean defaultVal) {
+ return getBoolean(name, defaultVal, true);
+ }
+
+ protected boolean getBoolean(String name, boolean defaultVal, boolean useDefault) {
+ String s = args.get(name);
+ if (s==null) {
+ if (useDefault) return defaultVal;
+ throw new InitializationException("Configuration Error: missing parameter '" + name + "'");
+ }
+ return Boolean.parseBoolean(s);
+ }
+
+ protected CharArraySet getWordSet(ResourceLoader loader,
+ String wordFiles, boolean ignoreCase) throws IOException {
+ assureMatchVersion();
+ List<String> files = splitFileNames(wordFiles);
+ CharArraySet words = null;
+ if (files.size() > 0) {
+ // default stopwords list has 35 or so words, but maybe don't make it that
+ // big to start
+ words = new CharArraySet(luceneMatchVersion,
+ files.size() * 10, ignoreCase);
+ for (String file : files) {
+ List<String> wlist = loader.getLines(file.trim());
+ words.addAll(StopFilter.makeStopSet(luceneMatchVersion, wlist,
+ ignoreCase));
+ }
+ }
+ return words;
+ }
+
+ /** same as {@link #getWordSet(ResourceLoader, String, boolean)},
+ * except the input is in snowball format. */
+ protected CharArraySet getSnowballWordSet(ResourceLoader loader,
+ String wordFiles, boolean ignoreCase) throws IOException {
+ assureMatchVersion();
+ List<String> files = splitFileNames(wordFiles);
+ CharArraySet words = null;
+ if (files.size() > 0) {
+ // default stopwords list has 35 or so words, but maybe don't make it that
+ // big to start
+ words = new CharArraySet(luceneMatchVersion,
+ files.size() * 10, ignoreCase);
+ for (String file : files) {
+ InputStream stream = null;
+ Reader reader = null;
+ try {
+ stream = loader.openResource(file.trim());
+ CharsetDecoder decoder = IOUtils.CHARSET_UTF_8.newDecoder()
+ .onMalformedInput(CodingErrorAction.REPORT)
+ .onUnmappableCharacter(CodingErrorAction.REPORT);
+ reader = new InputStreamReader(stream, decoder);
+ WordlistLoader.getSnowballWordSet(reader, words);
+ } finally {
+ IOUtils.closeWhileHandlingException(reader, stream);
+ }
+ }
+ }
+ return words;
+ }
+
+ /**
+ * Splits file names separated by comma character.
+ * File names can contain comma characters escaped by backslash '\'
+ *
+ * @param fileNames the string containing file names
+ * @return a list of file names with the escaping backslashed removed
+ */
+ protected List<String> splitFileNames(String fileNames) {
+ if (fileNames == null)
+ return Collections.<String>emptyList();
+
+ List<String> result = new ArrayList<String>();
+ for (String file : fileNames.split("(?<!\\\\),")) {
+ result.add(file.replaceAll("\\\\(?=,)", ""));
+ }
+
+ return result;
+ }
+}
Added: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java?rev=1335331&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java (added)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java Tue May 8 03:23:47 2012
@@ -0,0 +1,25 @@
+package org.apache.lucene.analysis.util;
+
+/*
+ * 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.apache.lucene.analysis.CharStream;
+
+public abstract class CharFilterFactory extends AbstractAnalysisFactory {
+
+ public abstract CharStream create(CharStream input);
+}
Added: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/InitializationException.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/InitializationException.java?rev=1335331&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/InitializationException.java (added)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/InitializationException.java Tue May 8 03:23:47 2012
@@ -0,0 +1,32 @@
+package org.apache.lucene.analysis.util;
+
+/*
+ * 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.
+ */
+
+/**
+ * Exception representing an error occurring during the initialization of a Factory.
+ */
+public class InitializationException extends RuntimeException {
+
+ public InitializationException(String message) {
+ super(message);
+ }
+
+ public InitializationException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Added: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java?rev=1335331&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java (added)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java Tue May 8 03:23:47 2012
@@ -0,0 +1,26 @@
+package org.apache.lucene.analysis.util;
+
+/*
+ * 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.apache.lucene.analysis.TokenStream;
+
+public abstract class TokenFilterFactory extends AbstractAnalysisFactory {
+
+ /** Transform the specified input TokenStream */
+ public abstract TokenStream create(TokenStream input);
+}
Added: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java?rev=1335331&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java (added)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java Tue May 8 03:23:47 2012
@@ -0,0 +1,28 @@
+package org.apache.lucene.analysis.util;
+
+/*
+ * 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.apache.lucene.analysis.Tokenizer;
+
+import java.io.Reader;
+
+public abstract class TokenizerFactory extends AbstractAnalysisFactory {
+
+ /** Creates a TokenStream of the specified input */
+ public abstract Tokenizer create(Reader input);
+}
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java Tue May 8 03:23:47 2012
@@ -21,6 +21,7 @@ import java.io.InputStream;
import org.apache.commons.io.IOUtils;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.collation.ICUCollationKeyFilter;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.SolrException;
@@ -70,7 +71,7 @@ import com.ibm.icu.util.ULocale;
* @deprecated use {@link org.apache.solr.schema.ICUCollationField} instead.
*/
@Deprecated
-public class ICUCollationKeyFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent,ResourceLoaderAware {
+public class ICUCollationKeyFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent, ResourceLoaderAware {
private Collator collator;
public void inform(ResourceLoader loader) {
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUFoldingFilterFactory.java Tue May 8 03:23:47 2012
@@ -2,6 +2,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.icu.ICUFoldingFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,7 +22,7 @@ import org.apache.lucene.analysis.icu.IC
*/
/** Factory for {@link ICUFoldingFilter} */
-public class ICUFoldingFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
+public class ICUFoldingFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
@Override
public TokenStream create(TokenStream input) {
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUNormalizer2FilterFactory.java Tue May 8 03:23:47 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.icu.ICUNormalizer2Filter;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import com.ibm.icu.text.FilteredNormalizer2;
import com.ibm.icu.text.Normalizer2;
@@ -44,7 +45,7 @@ import com.ibm.icu.text.UnicodeSet;
* @see Normalizer2
* @see FilteredNormalizer2
*/
-public class ICUNormalizer2FilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
+public class ICUNormalizer2FilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
private Normalizer2 normalizer;
// TODO: support custom normalization
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -21,9 +21,10 @@ import java.io.Reader;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.icu.segmentation.ICUTokenizer;
+import org.apache.lucene.analysis.util.TokenizerFactory;
/** Factory for {@link ICUTokenizer} */
-public class ICUTokenizerFactory extends BaseTokenizerFactory {
+public class ICUTokenizerFactory extends TokenizerFactory {
// TODO: add support for custom configs
@Override
public Tokenizer create(Reader input) {
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUTransformFilterFactory.java Tue May 8 03:23:47 2012
@@ -21,9 +21,9 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
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;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import com.ibm.icu.text.Transliterator;
@@ -37,7 +37,7 @@ import com.ibm.icu.text.Transliterator;
* </ul>
* @see Transliterator
*/
-public class ICUTransformFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
+public class ICUTransformFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
private Transliterator transliterator;
// TODO: add support for custom rules
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java Tue May 8 03:23:47 2012
@@ -26,6 +26,7 @@ import morfologik.stemming.PolishStemmer
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.morfologik.MorfologikFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Filter factory for {@link MorfologikFilter}.
@@ -44,7 +45,7 @@ import org.apache.lucene.analysis.morfol
*
* @see <a href="http://morfologik.blogspot.com/">Morfologik web site</a>
*/
-public class MorfologikFilterFactory extends BaseTokenFilterFactory {
+public class MorfologikFilterFactory extends TokenFilterFactory {
/** Dictionary. */
private DICTIONARY dictionary = DICTIONARY.MORFOLOGIK;
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseSentenceTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -21,12 +21,13 @@ import java.io.Reader;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.cn.smart.SentenceTokenizer;
+import org.apache.lucene.analysis.util.TokenizerFactory;
/**
* Factory for the SmartChineseAnalyzer {@link SentenceTokenizer}
* @lucene.experimental
*/
-public class SmartChineseSentenceTokenizerFactory extends BaseTokenizerFactory {
+public class SmartChineseSentenceTokenizerFactory extends TokenizerFactory {
public Tokenizer create(Reader input) {
return new SentenceTokenizer(input);
}
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/SmartChineseWordTokenFilterFactory.java Tue May 8 03:23:47 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
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.util.TokenFilterFactory;
/**
* Factory for the SmartChineseAnalyzer {@link WordTokenFilter}
@@ -30,7 +31,7 @@ import org.apache.lucene.analysis.cn.sma
* <code>words="org/apache/lucene/analysis/cn/smart/stopwords.txt"</code>
* @lucene.experimental
*/
-public class SmartChineseWordTokenFilterFactory extends BaseTokenFilterFactory {
+public class SmartChineseWordTokenFilterFactory extends TokenFilterFactory {
public TokenFilter create(TokenStream input) {
return new WordTokenFilter(input);
}
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -26,12 +26,13 @@ import org.apache.lucene.analysis.util.R
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.egothor.stemmer.Trie;
/**
* Factory for {@link StempelFilter} using a Polish stemming table.
*/
-public class StempelPolishStemFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
+public class StempelPolishStemFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private Trie stemmer = null;
private static final String STEMTABLE = "org/apache/lucene/analysis/pl/stemmer_20000.tbl";
Modified: lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java Tue May 8 03:23:47 2012
@@ -22,9 +22,9 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.solr.analysis.CommonGramsFilterFactory;
import org.apache.solr.analysis.StopFilterFactory;
-import org.apache.solr.analysis.TokenFilterFactory;
import org.apache.solr.analysis.TokenizerChain;
import org.apache.solr.schema.IndexSchema;
import org.carrot2.core.LanguageCode;
Modified: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMAAnnotationsTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -18,16 +18,16 @@ package org.apache.solr.uima.analysis;
*/
import org.apache.lucene.analysis.Tokenizer;
+import org.apache.lucene.analysis.util.TokenizerFactory;
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}
+ * {@link org.apache.lucene.analysis.util.TokenizerFactory} for {@link UIMAAnnotationsTokenizer}
*/
-public class UIMAAnnotationsTokenizerFactory extends BaseTokenizerFactory {
+public class UIMAAnnotationsTokenizerFactory extends TokenizerFactory {
private String descriptorPath;
private String tokenType;
Modified: lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/uima/src/java/org/apache/solr/uima/analysis/UIMATypeAwareAnnotationsTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -19,15 +19,15 @@ package org.apache.solr.uima.analysis;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.uima.UIMATypeAwareAnnotationsTokenizer;
-import org.apache.solr.analysis.BaseTokenizerFactory;
+import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
import java.util.Map;
/**
- * Solr {@link org.apache.solr.analysis.TokenizerFactory} for {@link UIMATypeAwareAnnotationsTokenizer}
+ * {@link org.apache.lucene.analysis.util.TokenizerFactory} for {@link UIMATypeAwareAnnotationsTokenizer}
*/
-public class UIMATypeAwareAnnotationsTokenizerFactory extends BaseTokenizerFactory {
+public class UIMATypeAwareAnnotationsTokenizerFactory extends TokenizerFactory {
private String descriptorPath;
private String tokenType;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java Tue May 8 03:23:47 2012
@@ -18,6 +18,8 @@
package org.apache.solr.analysis;
+
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
import org.apache.lucene.analysis.TokenStream;
@@ -32,7 +34,7 @@ import org.apache.lucene.analysis.TokenS
* </fieldType></pre>
*
*/
-public class ASCIIFoldingFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
+public class ASCIIFoldingFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
public ASCIIFoldingFilter create(TokenStream input) {
return new ASCIIFoldingFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -17,6 +17,7 @@ package org.apache.solr.analysis;
*/
import org.apache.lucene.analysis.ar.ArabicLetterTokenizer;
+import org.apache.lucene.analysis.util.TokenizerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,7 +30,7 @@ import java.util.Map;
* @deprecated (3.1) Use StandardTokenizerFactory instead.
**/
@Deprecated
-public class ArabicLetterTokenizerFactory extends BaseTokenizerFactory{
+public class ArabicLetterTokenizerFactory extends TokenizerFactory {
private static final Logger log = LoggerFactory.getLogger(ArabicLetterTokenizerFactory.class);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java Tue May 8 03:23:47 2012
@@ -18,6 +18,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ar.ArabicNormalizationFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
@@ -31,7 +32,7 @@ import org.apache.lucene.analysis.ar.Ara
* </fieldType></pre>
*
*/
-public class ArabicNormalizationFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
+public class ArabicNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
public ArabicNormalizationFilter create(TokenStream input) {
return new ArabicNormalizationFilter(input);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -18,6 +18,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ar.ArabicStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.ar.Ara
* </fieldType></pre>
*
*/
-public class ArabicStemFilterFactory extends BaseTokenFilterFactory{
+public class ArabicStemFilterFactory extends TokenFilterFactory {
public ArabicStemFilter create(TokenStream input) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BeiderMorseFilterFactory.java Tue May 8 03:23:47 2012
@@ -27,6 +27,7 @@ import org.apache.commons.codec.language
import org.apache.commons.codec.language.bm.RuleType;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.phonetic.BeiderMorseFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link BeiderMorseFilter}.
@@ -42,7 +43,7 @@ import org.apache.lucene.analysis.phonet
* </fieldType></pre>
*
*/
-public class BeiderMorseFilterFactory extends BaseTokenFilterFactory {
+public class BeiderMorseFilterFactory extends TokenFilterFactory {
private PhoneticEngine engine;
private LanguageSet languageSet;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -18,8 +18,10 @@
package org.apache.solr.analysis;
+
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.br.BrazilianStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link BrazilianStemFilter}.
@@ -33,7 +35,7 @@ import org.apache.lucene.analysis.br.Bra
* </fieldType></pre>
*
*/
-public class BrazilianStemFilterFactory extends BaseTokenFilterFactory {
+public class BrazilianStemFilterFactory extends TokenFilterFactory {
public BrazilianStemFilter create(TokenStream in) {
return new BrazilianStemFilter(in);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.bg.BulgarianStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link BulgarianStemFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.bg.Bul
* </fieldType></pre>
*
*/
-public class BulgarianStemFilterFactory extends BaseTokenFilterFactory {
+public class BulgarianStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new BulgarianStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKBigramFilterFactory.java Tue May 8 03:23:47 2012
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cjk.CJKBigramFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link CJKBigramFilter}.
@@ -36,7 +37,7 @@ import org.apache.lucene.analysis.cjk.CJ
* </analyzer>
* </fieldType></pre>
*/
-public class CJKBigramFilterFactory extends BaseTokenFilterFactory {
+public class CJKBigramFilterFactory extends TokenFilterFactory {
int flags;
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -20,6 +20,8 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.cjk.CJKTokenizer;
+import org.apache.lucene.analysis.util.TokenizerFactory;
+
import java.io.Reader;
/**
@@ -33,7 +35,7 @@ import java.io.Reader;
* @deprecated
*/
@Deprecated
-public class CJKTokenizerFactory extends BaseTokenizerFactory {
+public class CJKTokenizerFactory extends TokenizerFactory {
public CJKTokenizer create(Reader in) {
return new CJKTokenizer(in);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CJKWidthFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cjk.CJKWidthFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link CJKWidthFilter}.
@@ -33,7 +34,7 @@ import org.apache.lucene.analysis.cjk.CJ
* </fieldType></pre>
*/
-public class CJKWidthFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent {
+public class CJKWidthFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
@Override
public TokenStream create(TokenStream input) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java Tue May 8 03:23:47 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.miscellaneous.CapitalizationFilter;
import org.apache.lucene.analysis.util.CharArraySet;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.ArrayList;
import java.util.Collection;
@@ -56,7 +57,7 @@ import java.util.StringTokenizer;
*
* @since solr 1.3
*/
-public class CapitalizationFilterFactory extends BaseTokenFilterFactory {
+public class CapitalizationFilterFactory extends TokenFilterFactory {
public static final String KEEP = "keep";
public static final String KEEP_IGNORE_CASE = "keepIgnoreCase";
public static final String OK_PREFIX = "okPrefix";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java Tue May 8 03:23:47 2012
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cn.ChineseFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,7 +31,7 @@ import org.slf4j.LoggerFactory;
* @deprecated Use {@link StopFilterFactory} instead.
*/
@Deprecated
-public class ChineseFilterFactory extends BaseTokenFilterFactory {
+public class ChineseFilterFactory extends TokenFilterFactory {
private static final Logger log = LoggerFactory.getLogger(ChineseFilterFactory.class);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -23,6 +23,7 @@ import java.io.Reader;
import java.util.Map;
import org.apache.lucene.analysis.cn.ChineseTokenizer;
+import org.apache.lucene.analysis.util.TokenizerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +32,7 @@ import org.slf4j.LoggerFactory;
* @deprecated Use {@link StandardTokenizerFactory} instead.
*/
@Deprecated
-public class ChineseTokenizerFactory extends BaseTokenizerFactory {
+public class ChineseTokenizerFactory extends TokenizerFactory {
private static final Logger log = LoggerFactory.getLogger(ChineseTokenizerFactory.class);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.standard.ClassicFilter;
/**
@@ -33,7 +34,7 @@ import org.apache.lucene.analysis.standa
*
*
*/
-public class ClassicFilterFactory extends BaseTokenFilterFactory {
+public class ClassicFilterFactory extends TokenFilterFactory {
public TokenFilter create(TokenStream input) {
return new ClassicFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -20,6 +20,8 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.ClassicTokenizer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.analysis.util.TokenizerFactory;
+
import java.io.Reader;
import java.util.Map;
@@ -35,7 +37,7 @@ import java.util.Map;
*
*/
-public class ClassicTokenizerFactory extends BaseTokenizerFactory {
+public class ClassicTokenizerFactory extends TokenizerFactory {
private int maxTokenLength;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java Tue May 8 03:23:47 2012
@@ -26,6 +26,8 @@ import java.util.Locale;
import org.apache.commons.io.IOUtils;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.util.InitializationException;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.collation.CollationKeyFilter;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
@@ -70,7 +72,7 @@ import org.apache.lucene.analysis.util.R
* @deprecated use {@link org.apache.solr.schema.CollationField} instead.
*/
@Deprecated
-public class CollationKeyFilterFactory extends BaseTokenFilterFactory implements MultiTermAwareComponent,ResourceLoaderAware {
+public class CollationKeyFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent, ResourceLoaderAware {
private Collator collator;
public void inform(ResourceLoader loader) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java Tue May 8 03:23:47 2012
@@ -21,9 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
import org.apache.lucene.analysis.core.StopAnalyzer;
-import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.analysis.util.ResourceLoader;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.*;
/**
* Constructs a {@link CommonGramsFilter}.
@@ -40,7 +38,7 @@ import org.apache.lucene.analysis.util.R
/*
* This is pretty close to a straight copy from StopFilterFactory
*/
-public class CommonGramsFilterFactory extends BaseTokenFilterFactory implements
+public class CommonGramsFilterFactory extends TokenFilterFactory implements
ResourceLoaderAware {
public void inform(ResourceLoader loader) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java Tue May 8 03:23:47 2012
@@ -23,9 +23,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
import org.apache.lucene.analysis.commongrams.CommonGramsQueryFilter;
import org.apache.lucene.analysis.core.StopAnalyzer;
-import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.analysis.util.ResourceLoader;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.*;
/**
* Construct {@link CommonGramsQueryFilter}.
@@ -41,7 +39,7 @@ import org.apache.lucene.analysis.util.R
* </fieldType></pre>
*
*/
-public class CommonGramsQueryFilterFactory extends BaseTokenFilterFactory
+public class CommonGramsQueryFilterFactory extends TokenFilterFactory
implements ResourceLoaderAware {
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.cz.CzechStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link CzechStemFilter}.
@@ -31,7 +32,7 @@ import org.apache.lucene.analysis.cz.Cze
* </analyzer>
* </fieldType></pre>
*/
-public class CzechStemFilterFactory extends BaseTokenFilterFactory {
+public class CzechStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new CzechStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java Tue May 8 03:23:47 2012
@@ -22,8 +22,10 @@ import org.apache.lucene.analysis.payloa
import org.apache.lucene.analysis.payloads.FloatEncoder;
import org.apache.lucene.analysis.payloads.IntegerEncoder;
import org.apache.lucene.analysis.payloads.IdentityEncoder;
+import org.apache.lucene.analysis.util.InitializationException;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
import java.util.Map;
@@ -41,7 +43,7 @@ import java.util.Map;
*
*
*/
-public class DelimitedPayloadTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
+public class DelimitedPayloadTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
public static final String ENCODER_ATTR = "encoder";
public static final String DELIMITER_ATTR = "delimiter";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,9 +19,7 @@
package org.apache.solr.analysis;
import org.apache.lucene.analysis.compound.*;
-import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
-import org.apache.lucene.analysis.util.ResourceLoader;
+import org.apache.lucene.analysis.util.*;
import org.apache.lucene.analysis.TokenStream;
import java.util.Map;
@@ -39,7 +37,7 @@ import java.io.IOException;
* </fieldType></pre>
*
*/
-public class DictionaryCompoundWordTokenFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
+public class DictionaryCompoundWordTokenFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private CharArraySet dictionary;
private String dictFile;
private int minWordSize;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java Tue May 8 03:23:47 2012
@@ -20,6 +20,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link DoubleMetaphoneFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.phonet
* </fieldType></pre>
*
*/
-public class DoubleMetaphoneFilterFactory extends BaseTokenFilterFactory
+public class DoubleMetaphoneFilterFactory extends TokenFilterFactory
{
public static final String INJECT = "inject";
public static final String MAX_CODE_LENGTH = "maxCodeLength";
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java Tue May 8 03:23:47 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Creates new instances of {@link EdgeNGramTokenFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.ngram.
* </fieldType></pre>
*
*/
-public class EdgeNGramFilterFactory extends BaseTokenFilterFactory {
+public class EdgeNGramFilterFactory extends TokenFilterFactory {
private int maxGramSize = 0;
private int minGramSize = 0;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java Tue May 8 03:23:47 2012
@@ -18,6 +18,7 @@ package org.apache.solr.analysis;
*/
import org.apache.lucene.analysis.ngram.EdgeNGramTokenizer;
+import org.apache.lucene.analysis.util.TokenizerFactory;
import java.io.Reader;
import java.util.Map;
@@ -32,7 +33,7 @@ import java.util.Map;
* </fieldType></pre>
*
*/
-public class EdgeNGramTokenizerFactory extends BaseTokenizerFactory {
+public class EdgeNGramTokenizerFactory extends TokenizerFactory {
private int maxGramSize = 0;
private int minGramSize = 0;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,10 +19,8 @@
package org.apache.solr.analysis;
-import org.apache.lucene.analysis.util.ResourceLoader;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.*;
import org.apache.lucene.analysis.fr.*;
-import org.apache.lucene.analysis.util.CharArraySet;
import java.io.IOException;
import org.apache.lucene.analysis.TokenStream;
@@ -40,7 +38,7 @@ import org.apache.lucene.analysis.TokenS
* </fieldType></pre>
*
*/
-public class ElisionFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
+public class ElisionFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
private CharArraySet articles;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.en.EnglishMinimalStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link EnglishMinimalStemFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.en.Eng
* </fieldType></pre>
*
*/
-public class EnglishMinimalStemFilterFactory extends BaseTokenFilterFactory {
+public class EnglishMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new EnglishMinimalStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java Tue May 8 03:23:47 2012
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.en.EnglishPossessiveFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link EnglishPossessiveFilter}.
@@ -34,7 +35,7 @@ import org.apache.lucene.analysis.en.Eng
* </fieldType></pre>
*
*/
-public class EnglishPossessiveFilterFactory extends BaseTokenFilterFactory {
+public class EnglishPossessiveFilterFactory extends TokenFilterFactory {
@Override
public void init(Map<String,String> args) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java Tue May 8 03:23:47 2012
@@ -26,7 +26,6 @@ import java.nio.charset.CharsetDecoder;
import java.nio.charset.CodingErrorAction;
import java.text.ParseException;
import java.util.List;
-import java.util.Map;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -37,10 +36,9 @@ import org.apache.lucene.analysis.synony
import org.apache.lucene.analysis.synonym.SynonymMap;
import org.apache.lucene.analysis.synonym.SolrSynonymParser;
import org.apache.lucene.analysis.synonym.WordnetSynonymParser;
+import org.apache.lucene.analysis.util.*;
import org.apache.lucene.util.Version;
-import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.util.StrUtils;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +48,7 @@ import org.slf4j.LoggerFactory;
*/
// NOTE: rename this to "SynonymFilterFactory" and nuke that delegator in Lucene 5.0!
@Deprecated
-final class FSTSynonymFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
+final class FSTSynonymFilterFactory extends TokenFilterFactory implements ResourceLoaderAware {
public static final Logger log = LoggerFactory.getLogger(FSTSynonymFilterFactory.class);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.fi.FinnishLightStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link FinnishLightStemFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.fi.Fin
* </fieldType></pre>
*
*/
-public class FinnishLightStemFilterFactory extends BaseTokenFilterFactory {
+public class FinnishLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new FinnishLightStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.fr.FrenchLightStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link FrenchLightStemFilter}.
@@ -33,7 +34,7 @@ import org.apache.lucene.analysis.fr.Fre
* </fieldType></pre>
*
*/
-public class FrenchLightStemFilterFactory extends BaseTokenFilterFactory {
+public class FrenchLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new FrenchLightStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.fr.FrenchMinimalStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link FrenchMinimalStemFilter}.
@@ -33,7 +34,7 @@ import org.apache.lucene.analysis.fr.Fre
* </fieldType></pre>
*
*/
-public class FrenchMinimalStemFilterFactory extends BaseTokenFilterFactory {
+public class FrenchMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new FrenchMinimalStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianMinimalStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.gl.GalicianMinimalStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GalicianMinimalStemFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.gl.Gal
* </fieldType></pre>
*
*/
-public class GalicianMinimalStemFilterFactory extends BaseTokenFilterFactory {
+public class GalicianMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GalicianMinimalStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.gl.GalicianStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GalicianStemFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.gl.Gal
* </fieldType></pre>
*
*/
-public class GalicianStemFilterFactory extends BaseTokenFilterFactory {
+public class GalicianStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GalicianStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.de.GermanLightStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GermanLightStemFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.de.Ger
* </fieldType></pre>
*
*/
-public class GermanLightStemFilterFactory extends BaseTokenFilterFactory {
+public class GermanLightStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GermanLightStemFilter(input);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java?rev=1335331&r1=1335330&r2=1335331&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java Tue May 8 03:23:47 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.de.GermanMinimalStemFilter;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
/**
* Factory for {@link GermanMinimalStemFilter}.
@@ -32,7 +33,7 @@ import org.apache.lucene.analysis.de.Ger
* </fieldType></pre>
*
*/
-public class GermanMinimalStemFilterFactory extends BaseTokenFilterFactory {
+public class GermanMinimalStemFilterFactory extends TokenFilterFactory {
public TokenStream create(TokenStream input) {
return new GermanMinimalStemFilter(input);
}