Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-2510: Moved ResourceLoader/Aware into analysis module 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1332037 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christopher John Male 2012-04-30 01:34:48 +00:00
parent db9c825465
commit d8898b662d
60 changed files with 89 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
solr/solrj/src/java/org/apache/solr/common/ResourceLoader.java → lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java
View File

@ -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;
/**

11
solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java → lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java
View File

@ -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);
}

4
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/ICUCollationKeyFilterFactory.java
View File

@ -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;

4
solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/StempelPolishStemFilterFactory.java
View File

@ -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;
/**

2
solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
View File

@ -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;

2
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
View File

@ -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;

2
solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/FSTSynonymFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/HunspellStemFilterFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/JapanesePartOfSpeechStopFilterFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
View File

@ -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

4
solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/SlowSynonymFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
View File

@ -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;
/**

4
solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java
View File

@ -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}.

4
solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
View File

@ -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;

2
solr/core/src/java/org/apache/solr/schema/CollationField.java
View File

@ -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;

4
solr/core/src/java/org/apache/solr/schema/CurrencyField.java
View File

@ -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;

2
solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java
View File

@ -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;
/**

2
solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
View File

@ -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;

2
solr/core/src/java/org/apache/solr/schema/IndexSchema.java
View File

@ -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;

2
solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java
View File

@ -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;

2
solr/core/src/java/org/apache/solr/util/SystemIdResolver.java
View File

@ -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;

2
solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
View File

@ -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;

2
solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java
View File

@ -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 {

2
solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java
View File

@ -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 {

2
solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java
View File

@ -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;
/**

2
solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java
View File

@ -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;
/**

2
solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java
View File

@ -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;
/**

2
solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java
View File

@ -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;
/**

2
solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java
View File

@ -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;
/**

2
solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java
View File

@ -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 {

2
solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java
View File

@ -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;
/**

2
solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
View File

@ -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;

2
solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java
View File

@ -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;

2
solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java
View File

@ -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;