Index: solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java (working copy) @@ -19,7 +19,7 @@ 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; Index: solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java (working copy) @@ -27,7 +27,7 @@ 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; /** Index: solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java (working copy) @@ -25,7 +25,7 @@ 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; /** Index: solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java (working copy) @@ -25,7 +25,7 @@ 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; /** Index: solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java (working copy) @@ -20,7 +20,7 @@ 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; Index: solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java (working copy) @@ -25,7 +25,7 @@ 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; Index: solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java (working copy) @@ -27,7 +27,7 @@ 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 { Index: solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java (working copy) @@ -27,7 +27,7 @@ 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; /** Index: solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java (working copy) @@ -26,7 +26,7 @@ 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; /** Index: solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java (working copy) @@ -19,7 +19,7 @@ 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; Index: solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java (working copy) @@ -18,7 +18,7 @@ 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; Index: solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java (working copy) @@ -25,7 +25,7 @@ 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; /** Index: solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java (working copy) @@ -21,7 +21,7 @@ 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; Index: solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java (working copy) @@ -17,7 +17,7 @@ */ 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; Index: solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java (working copy) @@ -31,7 +31,7 @@ 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 { Index: solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java (working copy) @@ -30,7 +30,7 @@ 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 { Index: solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java =================================================================== --- solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java (working copy) @@ -18,7 +18,7 @@ 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; Index: solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java =================================================================== --- solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java (working copy) @@ -26,7 +26,7 @@ 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; Index: solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java =================================================================== --- solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java (working copy) @@ -21,7 +21,7 @@ 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; Index: solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java =================================================================== --- solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java (working copy) @@ -17,7 +17,7 @@ */ 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; Index: solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java =================================================================== --- solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java (revision 1332035) +++ solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java (working copy) @@ -18,7 +18,7 @@ */ 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; Index: solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (working copy) @@ -22,8 +22,8 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java (working copy) @@ -38,9 +38,9 @@ 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; Index: solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java (working copy) @@ -27,8 +27,8 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java (working copy) @@ -31,8 +31,8 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java (working copy) @@ -22,8 +22,8 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (working copy) @@ -22,7 +22,7 @@ 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; Index: solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java (working copy) @@ -19,9 +19,9 @@ 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; Index: solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java (working copy) @@ -24,8 +24,8 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java (working copy) @@ -27,9 +27,9 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (working copy) @@ -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; Index: solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java (working copy) @@ -5,8 +5,8 @@ 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 Index: solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java (working copy) @@ -24,8 +24,8 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (working copy) @@ -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; Index: solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (working copy) @@ -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; Index: solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (working copy) @@ -24,8 +24,8 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java (working copy) @@ -22,8 +22,8 @@ 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; Index: solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java (working copy) @@ -22,8 +22,8 @@ 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; Index: solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java (working copy) @@ -23,9 +23,9 @@ 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}. Index: solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (working copy) @@ -24,8 +24,8 @@ 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; /** Index: solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java (working copy) @@ -19,9 +19,9 @@ 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; Index: solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java (working copy) @@ -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; Index: solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java =================================================================== --- solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java (working copy) @@ -24,8 +24,8 @@ 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; Index: solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java =================================================================== --- solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (working copy) @@ -49,14 +49,14 @@ 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; Index: solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java (working copy) @@ -25,7 +25,7 @@ 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; Index: solr/core/src/java/org/apache/solr/schema/IndexSchema.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/IndexSchema.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/schema/IndexSchema.java (working copy) @@ -23,7 +23,7 @@ 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; Index: solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java (working copy) @@ -19,7 +19,7 @@ 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; /** Index: solr/core/src/java/org/apache/solr/schema/CollationField.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/CollationField.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/schema/CollationField.java (working copy) @@ -37,7 +37,7 @@ 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; Index: solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (working copy) @@ -21,7 +21,7 @@ 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; Index: solr/core/src/java/org/apache/solr/schema/CurrencyField.java =================================================================== --- solr/core/src/java/org/apache/solr/schema/CurrencyField.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/schema/CurrencyField.java (working copy) @@ -22,7 +22,7 @@ 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.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; Index: solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java =================================================================== --- solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java (working copy) @@ -29,7 +29,7 @@ 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; Index: solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java =================================================================== --- solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (working copy) @@ -22,7 +22,7 @@ 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; Index: solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java (deleted) =================================================================== Index: solr/core/src/java/org/apache/solr/util/SystemIdResolver.java =================================================================== --- solr/core/src/java/org/apache/solr/util/SystemIdResolver.java (revision 1332035) +++ solr/core/src/java/org/apache/solr/util/SystemIdResolver.java (working copy) @@ -20,7 +20,7 @@ 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; Index: solr/solrj/src/java/org/apache/solr/common/ResourceLoader.java (deleted) =================================================================== Index: solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java =================================================================== --- solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java (revision 1332035) +++ solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java (working copy) @@ -19,7 +19,7 @@ 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; Index: solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java (revision 1332035) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java (working copy) @@ -33,7 +33,7 @@ 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; Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java (revision 1332035) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java (working copy) @@ -22,10 +22,10 @@ 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; /** Index: solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java =================================================================== --- solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java (revision 1332035) +++ solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java (working copy) @@ -22,10 +22,10 @@ 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; Index: solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java =================================================================== --- solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java (revision 1332035) +++ solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java (working copy) @@ -23,7 +23,7 @@ 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; Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java (revision 1332035) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java (working copy) @@ -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.InputStream; import java.util.List; -/** - * @since solr 1.3 - */ -public interface ResourceLoader -{ +public interface ResourceLoader { + public InputStream openResource(String resource) throws IOException; /** Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java (revision 1332035) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java (working copy) @@ -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); }