diff --git a/solr/solrj/src/java/org/apache/solr/common/ResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java similarity index 93% rename from solr/solrj/src/java/org/apache/solr/common/ResourceLoader.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java index 2c0b3b71dd7..4d1ff374c46 100644 --- a/solr/solrj/src/java/org/apache/solr/common/ResourceLoader.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java @@ -1,4 +1,4 @@ -package org.apache.solr.common; +package org.apache.lucene.analysis.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -21,11 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -/** - * @since solr 1.3 - */ -public interface ResourceLoader -{ +public interface ResourceLoader { + public InputStream openResource(String resource) throws IOException; /** diff --git a/solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java similarity index 80% rename from solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java rename to lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java index 461f48ddc73..c3ccd77f876 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java @@ -15,14 +15,9 @@ * limitations under the License. */ -package org.apache.solr.util.plugin; +package org.apache.lucene.analysis.util; -import org.apache.solr.common.ResourceLoader; +public interface ResourceLoaderAware { -/** - * @since solr 1.3 - */ -public interface ResourceLoaderAware -{ - void inform( ResourceLoader loader ); + void inform(ResourceLoader loader); } diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java b/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java index f545070a141..2010de7ff2d 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java +++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java @@ -22,10 +22,10 @@ import java.io.InputStream; import org.apache.commons.io.IOUtils; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.collation.ICUCollationKeyFilter; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import com.ibm.icu.text.Collator; import com.ibm.icu.text.RuleBasedCollator; diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java b/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java index 9467d89a0e6..f8396ab32ff 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java +++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java @@ -22,10 +22,10 @@ import java.io.IOException; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.stempel.StempelFilter; import org.apache.lucene.analysis.stempel.StempelStemmer; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.egothor.stemmer.Trie; /** diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java index 9cda6048d05..82c5181b788 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java +++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java @@ -33,7 +33,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.response.TextResponseWriter; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java index faa6a4edf1c..70bfae78806 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java @@ -19,7 +19,7 @@ package org.apache.solr.handler.dataimport; import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow; import org.apache.solr.core.SolrCore; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.util.SystemIdResolver; import org.apache.solr.common.util.XMLErrorLogger; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java b/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java index b3ed1496210..909b120aeb2 100644 --- a/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.Version; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java index 1ba53b98e55..25194e803b4 100644 --- a/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java @@ -27,8 +27,8 @@ import java.util.Locale; import org.apache.commons.io.IOUtils; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.collation.CollationKeyFilter; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Factory for {@link CollationKeyFilter}. diff --git a/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java index 9a955dd3056..e74a66a69c7 100644 --- a/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java @@ -22,8 +22,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.util.CharArraySet; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Constructs a {@link CommonGramsFilter}. diff --git a/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java index ee500903afd..26a8bd4aa58 100644 --- a/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java @@ -24,8 +24,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.util.CharArraySet; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Construct {@link CommonGramsQueryFilter}. diff --git a/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java index dfd42294610..bf7e90b2a6b 100644 --- a/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java @@ -22,8 +22,8 @@ import org.apache.lucene.analysis.payloads.PayloadEncoder; import org.apache.lucene.analysis.payloads.FloatEncoder; import org.apache.lucene.analysis.payloads.IntegerEncoder; import org.apache.lucene.analysis.payloads.IdentityEncoder; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java index 0e603de8230..fb728bcdf78 100644 --- a/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java @@ -20,8 +20,8 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.compound.*; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.util.plugin.ResourceLoaderAware; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.analysis.TokenStream; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java index e07591de785..fb05d065566 100644 --- a/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java @@ -19,8 +19,8 @@ package org.apache.solr.analysis; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.lucene.analysis.fr.*; import org.apache.lucene.analysis.util.CharArraySet; diff --git a/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java index c63f676aa6a..1f1d4a1d0e5 100644 --- a/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java @@ -38,9 +38,9 @@ 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.util.Version; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java index 3502f2abcdc..df7e362cd5d 100644 --- a/solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hunspell.HunspellDictionary; import org.apache.lucene.analysis.hunspell.HunspellStemFilter; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * TokenFilterFactory that creates instances of {@link org.apache.lucene.analysis.hunspell.HunspellStemFilter}. diff --git a/solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java index 412d5b69035..9472337061c 100644 --- a/solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java @@ -24,8 +24,8 @@ import org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter; import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.solr.analysis.BaseTokenFilterFactory; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import java.util.Map; import java.io.InputStream; diff --git a/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java index 30ee2b626b5..f3ff2b0a812 100644 --- a/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java @@ -24,8 +24,8 @@ import java.util.Set; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Factory for {@link org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter}. diff --git a/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java index 696bd8aa401..174b73a5617 100644 --- a/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java @@ -31,8 +31,8 @@ import org.apache.lucene.analysis.ja.JapaneseTokenizer; import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; import org.apache.lucene.analysis.ja.dict.UserDictionary; import org.apache.lucene.util.IOUtils; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Factory for {@link org.apache.lucene.analysis.ja.JapaneseTokenizer}. diff --git a/solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java index 9b2e9e86b62..a77be205ad9 100644 --- a/solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java @@ -17,8 +17,8 @@ package org.apache.solr.analysis; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.KeepWordFilter; import org.apache.lucene.analysis.util.CharArraySet; diff --git a/solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java index 2455ce26069..ffea9f93409 100644 --- a/solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java @@ -5,8 +5,8 @@ import java.io.IOException; import org.apache.lucene.analysis.miscellaneous.KeywordMarkerFilter; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.TokenStream; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java index 2ed69dfe19f..74b03109b63 100644 --- a/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java @@ -27,9 +27,9 @@ import java.util.regex.Pattern; import org.apache.lucene.analysis.CharStream; import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Factory for {@link MappingCharFilter}. diff --git a/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java index 07bbc63e0ee..806869ce322 100644 --- a/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java @@ -19,9 +19,9 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java index 0575c85ba20..7856679b4ad 100644 --- a/solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java @@ -24,8 +24,8 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.tartarus.snowball.SnowballProgram; /** diff --git a/solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java index 8f18ef4c84d..3a81101ee22 100644 --- a/solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java @@ -23,9 +23,9 @@ import java.util.List; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter; import org.apache.lucene.analysis.util.CharArrayMap; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Factory for {@link StemmerOverrideFilter}. diff --git a/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java index 99278fc872c..5a0b7a6e1f0 100644 --- a/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java @@ -17,8 +17,8 @@ package org.apache.solr.analysis; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.StopAnalyzer; import org.apache.lucene.analysis.core.StopFilter; diff --git a/solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java index 78c9702e8b1..4ee7c2749c2 100644 --- a/solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java @@ -22,8 +22,8 @@ import java.util.Map; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.util.Version; -import org.apache.solr.common.ResourceLoader; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; /** * Factory for {@link SynonymFilter}. diff --git a/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java index 09908a28a9f..0ee19b594fb 100644 --- a/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java @@ -19,9 +19,9 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.TypeTokenFilter; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import java.io.IOException; import java.util.HashSet; diff --git a/solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java index a5a697ee377..8cea6de06d0 100644 --- a/solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java @@ -22,8 +22,8 @@ import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter; import org.apache.lucene.analysis.miscellaneous.WordDelimiterIterator; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.util.plugin.ResourceLoaderAware; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java index 4af1dcbb073..df4b7904177 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java +++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java @@ -49,14 +49,14 @@ import org.apache.solr.analysis.CharFilterFactory; import org.apache.solr.analysis.TokenFilterFactory; import org.apache.solr.analysis.TokenizerFactory; import org.apache.solr.util.FileUtils; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.handler.component.SearchComponent; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.QueryResponseWriter; import org.apache.solr.schema.FieldType; import org.apache.solr.update.processor.UpdateRequestProcessorFactory; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.solr.util.plugin.SolrCoreAware; import org.apache.solr.search.QParserPlugin; diff --git a/solr/core/src/java/org/apache/solr/schema/CollationField.java b/solr/core/src/java/org/apache/solr/schema/CollationField.java index 0e3a6d43d6a..53271230cec 100644 --- a/solr/core/src/java/org/apache/solr/schema/CollationField.java +++ b/solr/core/src/java/org/apache/solr/schema/CollationField.java @@ -37,7 +37,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.response.TextResponseWriter; diff --git a/solr/core/src/java/org/apache/solr/schema/CurrencyField.java b/solr/core/src/java/org/apache/solr/schema/CurrencyField.java index b6f40ae72ee..e1ee2f47710 100644 --- a/solr/core/src/java/org/apache/solr/schema/CurrencyField.java +++ b/solr/core/src/java/org/apache/solr/schema/CurrencyField.java @@ -22,7 +22,7 @@ import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.search.Query; import org.apache.lucene.search.SortField; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.response.TextResponseWriter; @@ -30,7 +30,7 @@ import org.apache.solr.response.XMLWriter; import org.apache.solr.search.QParser; import org.apache.solr.search.SolrConstantScoreQuery; import org.apache.solr.search.function.ValueSourceRangeFilter; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java b/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java index 9314e08ed15..6c6ac785120 100644 --- a/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java +++ b/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java @@ -19,7 +19,7 @@ package org.apache.solr.schema; import java.util.Map; import java.util.Set; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; /** diff --git a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java index 732b4df0475..50b14a64ad6 100644 --- a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java +++ b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.util.Version; import org.apache.solr.analysis.*; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.util.DOMUtil; import org.apache.solr.core.Config; diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java index 610c56f5740..6b48187b58a 100644 --- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java +++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.search.similarities.DefaultSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.util.Version; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.SolrParams; import org.apache.solr.util.DOMUtil; diff --git a/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java b/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java index c8bf342ff59..ca9f304da4f 100644 --- a/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java +++ b/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; import org.apache.noggit.JSONParser; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java b/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java index 145bce74c5c..fbcb1ca8eba 100644 --- a/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java +++ b/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java @@ -20,7 +20,7 @@ package org.apache.solr.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.xml.sax.InputSource; import org.xml.sax.EntityResolver; diff --git a/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java index c0eaaf7f289..a5ac493983f 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java @@ -22,7 +22,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.util.DOMUtil; diff --git a/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java b/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java index 1ccfc49c284..a6bcc14dec0 100644 --- a/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java +++ b/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java @@ -29,7 +29,7 @@ import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.util.SystemIdResolver; import org.apache.solr.common.util.XMLErrorLogger; import org.apache.solr.core.SolrConfig; diff --git a/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java index 7ed547c1b06..4a4ae09f648 100644 --- a/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; import java.io.StringReader; diff --git a/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java index 76bb3c8fc71..6349ef0ddfd 100644 --- a/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java @@ -20,7 +20,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; import java.io.StringReader; diff --git a/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java index 76ef119c8fe..e3249528b72 100644 --- a/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java @@ -19,7 +19,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.util.StrUtils; import org.apache.solr.core.SolrResourceLoader; import org.tartarus.snowball.ext.EnglishStemmer; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java index 4004f192e9c..99fc6cc325a 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java @@ -31,7 +31,7 @@ import java.util.Map; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; public class TestCollationKeyFilterFactory extends BaseTokenTestCase { diff --git a/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java index a48a00e9c50..af1ef7879b4 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.payloads.DelimitedPayloadTokenFilter; import org.apache.lucene.analysis.payloads.FloatEncoder; import org.apache.lucene.analysis.payloads.PayloadHelper; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; public class TestDelimitedPayloadTokenFilterFactory extends BaseTokenTestCase { diff --git a/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java index c0fb2d72cb6..5bcdd8b60cb 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; /** diff --git a/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java index fb4f44dead1..8b57e471093 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; /** diff --git a/solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java index 7213a983720..2020882c1c6 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; /** diff --git a/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java index 8406beec72d..5a4cefca5d1 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java @@ -17,7 +17,7 @@ package org.apache.solr.analysis; */ import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java index 33a3a67807a..0ed3e45fdbc 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.en.PorterStemFilter; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; /** diff --git a/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java b/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java index 09527cfd8df..a0ec832d99d 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java @@ -19,7 +19,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java index 267181661e5..3ac17b01fe1 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.en.PorterStemFilter; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; /** diff --git a/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java index c26449c500f..a98a439828b 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java index 1b46e70314b..da5f035a688 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java @@ -30,7 +30,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.util.Version; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; public class TestSynonymFilterFactory extends BaseTokenTestCase { diff --git a/solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java b/solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java index 0afd7ffa509..740a7a5f3ce 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java @@ -26,7 +26,7 @@ import java.util.Map; import org.apache.lucene.analysis.Token; import org.apache.lucene.util.LuceneTestCase; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; /** diff --git a/solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java index fc5646f806f..fd0308c14b1 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java @@ -18,7 +18,7 @@ package org.apache.solr.analysis; import org.apache.lucene.analysis.NumericTokenStream; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java index d5096b5d1ef..f1339cc9a41 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.core.SolrResourceLoader; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java index 4891c30d09a..24819ab1cde 100644 --- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java +++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java @@ -26,7 +26,7 @@ import org.apache.solr.common.SolrException; import org.apache.solr.handler.admin.LukeRequestHandler; import org.apache.solr.handler.component.FacetComponent; import org.apache.solr.response.JSONResponseWriter; -import org.apache.solr.util.plugin.ResourceLoaderAware; +import org.apache.lucene.analysis.util.ResourceLoaderAware; import org.apache.solr.util.plugin.SolrCoreAware; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java b/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java index 1161ac7da37..56c534face0 100644 --- a/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java +++ b/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java index 29f0621f620..748ab74b5e5 100644 --- a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java +++ b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java @@ -17,7 +17,7 @@ package org.apache.solr.schema; */ import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.core.SolrResourceLoader; import org.junit.Before; diff --git a/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java b/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java index 6cc3e0b2ac5..01ae4b55bd4 100644 --- a/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java +++ b/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java @@ -18,7 +18,7 @@ package org.apache.solr.util; */ import org.apache.solr.core.SolrResourceLoader; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java b/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java index 045d67bb5ef..35058731f34 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java @@ -23,7 +23,7 @@ import java.io.InputStream; import java.util.Arrays; import java.util.List; -import org.apache.solr.common.ResourceLoader; +import org.apache.lucene.analysis.util.ResourceLoader; class StringMockSolrResourceLoader implements ResourceLoader { String text;