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

SOLR-135: refactoring common classes into a "common" package. This commit moves the files (and updates the imports). 

THIS BREAKS API COMPATIBILITY!!!

the next commit will put stub classes in place where the missing classes are.

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@547101 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley 2007-06-14 03:26:18 +00:00
parent f461ea38a2
commit b4d1694ef7
105 changed files with 326 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
build.xml
View File

@ -95,6 +95,43 @@
<available property="junitPresent"
classname="junit.framework.TestCase" />
<!-- Macro for compilation -->
<macrodef name="solr-javac">
<attribute name="destdir" />
<attribute name="classpathref" />
<element name="nested" optional="true" implicit="true" />
<sequential>
<mkdir dir="@{destdir}" />
<javac destdir="@{destdir}"
target="${java.compat.version}"
source="${java.compat.version}"
debug="on"
encoding="utf8"
classpathref="@{classpathref}">
<nested />
</javac>
</sequential>
</macrodef>
<!-- Macro for building Jars -->
<macrodef name="solr-jar">
<attribute name="destfile" />
<attribute name="basedir" />
<attribute name="includes" default="org/apache/**" />
<attribute name="manifest" default="${dest}/META-INF/MANIFEST.MF" />
<element name="nested" optional="true" implicit="true" />
<sequential>
<jar destfile="@{destfile}"
basedir="@{basedir}"
includes="@{includes}"
filesetmanifest="skip"
manifest="@{manifest}">
<metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
<nested />
</jar>
</sequential>
</macrodef>
<!-- Macro for building checksum files
This is only needed until the "format" option is supported
by ant's built in checksum task
@ -158,31 +195,37 @@
<!-- ===================== COMPILATION-RELATED TASKS ========================= -->
<!-- ========================================================================= -->
<!-- Compile common classes. -->
<target name="compile-common"
description="Compile the source code."
depends="init-forrest-entities,checkJunitPresence">
<solr-javac destdir="${dest}/common"
classpathref="compile.classpath">
<src path="${src}/java" />
<include name="org/apache/solr/common/**" />
</solr-javac>
</target>
<!-- The compilation classpath -->
<path id="compile.classpath">
<fileset dir="${lib}">
<include name="*.jar" />
</fileset>
<pathelement location="${dest}/common"/>
</path>
<!-- Compile the project. -->
<target name="compile"
description="Compile the source code."
depends="init-forrest-entities,checkJunitPresence">
depends="compile-common,init-forrest-entities,checkJunitPresence">
<mkdir dir="${dest}" />
<javac destdir="${dest}"
target="${java.compat.version}"
source="${java.compat.version}"
debug="on"
encoding="utf8"
classpathref="compile.classpath">
<solr-javac destdir="${dest}/core"
classpathref="compile.classpath">
<src path="${src}/java" />
<src path="${src}/webapp/src" />
</javac>
<exclude name="org/apache/solr/common/**" />
</solr-javac>
</target>
@ -237,7 +280,8 @@
<!-- For now, it's the same as main classpath. Later it will have JUnit, Clover, etc. -->
<path id="test.compile.classpath">
<path refid="compile.classpath" />
<pathelement location="${dest}"/>
<pathelement location="${dest}/common"/>
<pathelement location="${dest}/core"/>
</path>
<path id="test.run.classpath">
@ -263,15 +307,11 @@
depends="compile,checkJunitPresence">
<mkdir dir="${dest}/tests" />
<javac
<solr-javac
destdir="${dest}/tests"
target="${java.compat.version}"
source="${java.compat.version}"
debug="on"
encoding="utf8"
classpathref="test.compile.classpath">
<src path="${src}/test" />
</javac>
</solr-javac>
</target>
<!-- Run unit tests. -->
@ -399,6 +439,7 @@
</lib>
<lib dir="${dist}">
<include name="${fullnamever}.jar" />
<include name="${fullnamever}-common.jar" />
</lib>
<fileset dir="${src}/webapp/resources" />
<metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
@ -410,13 +451,15 @@
description="Creates the Solr JAR Distribution file."
depends="compile, make-manifest">
<mkdir dir="${dist}" />
<jar destfile="${dist}/${fullnamever}.jar"
basedir="${dest}"
includes="org/apache/**"
filesetmanifest="skip"
manifest="${dest}/META-INF/MANIFEST.MF">
<metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
</jar>
<solr-jar
destfile="${dist}/${fullnamever}.jar"
basedir="${dest}/core" />
<!-- package the common classes together -->
<solr-jar
destfile="${dist}/${fullnamever}-common.jar"
basedir="${dest}/common" />
</target>
<target name="example"
@ -425,13 +468,15 @@
<copy file="${dist}/${fullnamever}.war"
tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar"
basedir="${dest}"
basedir="${dest}/core"
filesetmanifest="skip"
includes="org/apache/solr/util/SimplePostTool*.class">
<manifest>
<attribute name="Main-Class"
value="org.apache.solr.util.SimplePostTool"/>
</manifest>
</jar>
<copy todir="${example}/solr/bin">
<fileset dir="${src}/scripts">
<exclude name="scripts.conf"/>

2
src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
View File

@ -20,7 +20,7 @@ package org.apache.solr.analysis;
import org.apache.commons.io.IOUtils;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import java.io.IOException;
import java.io.Reader;

2
src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
View File

@ -26,7 +26,7 @@ import org.apache.commons.codec.language.Metaphone;
import org.apache.commons.codec.language.RefinedSoundex;
import org.apache.commons.codec.language.Soundex;
import org.apache.lucene.analysis.TokenStream;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
/**
* Create tokens based on phonetic encoders

2
src/java/org/apache/solr/analysis/TrimFilterFactory.java
View File

@ -20,7 +20,7 @@ package org.apache.solr.analysis;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
/**
* @version $Id:$

2
src/java/org/apache/solr/util/SolrDocument.java → src/java/org/apache/solr/common/SolrDocument.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common;
import java.util.ArrayList;
import java.util.Collection;

2
src/java/org/apache/solr/core/SolrException.java → src/java/org/apache/solr/common/SolrException.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.core;
package org.apache.solr.common;
import java.util.logging.Logger;
import java.io.CharArrayWriter;

2
src/java/org/apache/solr/util/SolrInputDocument.java → src/java/org/apache/solr/common/SolrInputDocument.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common;
import java.util.HashMap;
import java.util.Map;

2
src/java/org/apache/solr/request/AppendedSolrParams.java → src/java/org/apache/solr/common/params/AppendedSolrParams.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.common.params;
/**
* SolrParams wrapper which acts similar to DefaultSolrParams except that

5
src/java/org/apache/solr/util/CommonParams.java → src/java/org/apache/solr/common/params/CommonParams.java
View File

@ -15,12 +15,11 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.params;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.NamedList;
import org.apache.solr.request.SolrParams;

4
src/java/org/apache/solr/request/DefaultSolrParams.java → src/java/org/apache/solr/common/params/DefaultSolrParams.java
View File

@ -15,11 +15,11 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.common.params;
import java.util.Iterator;
import org.apache.solr.util.IteratorChain;
import org.apache.solr.common.util.IteratorChain;
/**
* @author yonik

6
src/java/org/apache/solr/util/DisMaxParams.java → src/java/org/apache/solr/common/params/DisMaxParams.java
View File

@ -15,14 +15,14 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.params;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.core.SolrException;
import org.apache.solr.util.StrUtils;
import org.apache.solr.util.NamedList;
import java.util.logging.Logger;
import java.util.logging.Level;

2
src/java/org/apache/solr/request/MapSolrParams.java → src/java/org/apache/solr/common/params/MapSolrParams.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.common.params;
import org.apache.solr.util.StrUtils;

2
src/java/org/apache/solr/request/MultiMapSolrParams.java → src/java/org/apache/solr/common/params/MultiMapSolrParams.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.common.params;
import org.apache.solr.util.StrUtils;

4
src/java/org/apache/solr/request/RequiredSolrParams.java → src/java/org/apache/solr/common/params/RequiredSolrParams.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.common.params;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import java.util.Iterator;

8
src/java/org/apache/solr/request/SolrParams.java → src/java/org/apache/solr/common/params/SolrParams.java
View File

@ -15,15 +15,15 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.common.params;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.solr.core.SolrException;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
/** SolrParams hold request parameters.
*

2
src/java/org/apache/solr/util/UpdateParams.java → src/java/org/apache/solr/common/params/UpdateParams.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.params;
/**
* A collection of standard params used by Update handlers

2
src/java/org/apache/solr/util/ContentStream.java → src/java/org/apache/solr/common/util/ContentStream.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import java.io.IOException;
import java.io.InputStream;

2
src/java/org/apache/solr/util/ContentStreamBase.java → src/java/org/apache/solr/common/util/ContentStreamBase.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import java.io.ByteArrayInputStream;
import java.io.File;

4
src/java/org/apache/solr/util/DOMUtil.java → src/java/org/apache/solr/common/util/DOMUtil.java
View File

@ -15,13 +15,13 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import java.util.Map;
import java.util.HashMap;

2
src/java/org/apache/solr/util/IteratorChain.java → src/java/org/apache/solr/common/util/IteratorChain.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import java.util.ArrayList;
import java.util.Iterator;

2
src/java/org/apache/solr/util/MoreLikeThisParams.java → src/java/org/apache/solr/common/util/MoreLikeThisParams.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.util;
package org.apache.solr.common.util;
public interface MoreLikeThisParams
{

3
src/java/org/apache/solr/util/NamedList.java → src/java/org/apache/solr/common/util/NamedList.java
View File

@ -15,12 +15,13 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import java.util.*;
import java.io.Serializable;
/**
* A simple container class for modeling an ordered list of name/value pairs.
*

3
src/java/org/apache/solr/util/SimpleOrderedMap.java → src/java/org/apache/solr/common/util/SimpleOrderedMap.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.util;
package org.apache.solr.common.util;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@ -19,6 +19,7 @@ package org.apache.solr.util;
import java.util.*;
/** <code>SimpleOrderedMap</code> is a {@link NamedList} where access by key is more
* important than maintaining order when it comes to representing the
* held data in other forms, as ResponseWriters normally do.

2
src/java/org/apache/solr/util/XML.java → src/java/org/apache/solr/common/util/XML.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import java.io.Writer;
import java.io.IOException;

2
src/java/org/apache/solr/core/AbstractSolrEventListener.java
View File

@ -17,8 +17,8 @@
package org.apache.solr.core;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.NamedList;
/**
* @author yonik

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

@ -20,9 +20,9 @@ package org.apache.solr.core;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.util.DOMUtil;
import javax.naming.Context;
import javax.naming.InitialContext;

2
src/java/org/apache/solr/core/QuerySenderListener.java
View File

@ -20,9 +20,9 @@ package org.apache.solr.core;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.DocList;
import org.apache.solr.search.DocIterator;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.NamedList;
import java.util.List;

9
src/java/org/apache/solr/core/RequestHandlers.java
View File

@ -26,13 +26,14 @@ import java.util.logging.Logger;
import javax.xml.xpath.XPathConstants;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.handler.StandardRequestHandler;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.StandardRequestHandler;
import org.apache.solr.util.DOMUtil;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

3
src/java/org/apache/solr/core/RunExecutableListener.java
View File

@ -17,7 +17,8 @@
package org.apache.solr.core;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.SolrIndexSearcher;
import java.io.File;

2
src/java/org/apache/solr/core/SolrConfig.java
View File

@ -17,9 +17,9 @@
package org.apache.solr.core;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.NamedList;
import org.xml.sax.SAXException;

11
src/java/org/apache/solr/core/SolrCore.java
View File

@ -36,26 +36,27 @@ import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.SolrParams.EchoParamStyle;
import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.request.JSONResponseWriter;
import org.apache.solr.request.PythonResponseWriter;
import org.apache.solr.request.QueryResponseWriter;
import org.apache.solr.request.RubyResponseWriter;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.XMLResponseWriter;
import org.apache.solr.request.SolrParams.EchoParamStyle;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.update.DirectUpdateHandler;
import org.apache.solr.update.SolrIndexConfig;
import org.apache.solr.update.SolrIndexWriter;
import org.apache.solr.update.UpdateHandler;
import org.apache.solr.util.DOMUtil;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.RefCounted;
import org.apache.solr.util.SimpleOrderedMap;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

2
src/java/org/apache/solr/core/SolrEventListener.java
View File

@ -17,7 +17,7 @@
package org.apache.solr.core;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.SolrIndexSearcher;
import java.util.logging.Logger;

2
src/java/org/apache/solr/core/SolrInfoMBean.java
View File

@ -18,6 +18,8 @@
package org.apache.solr.core;
import java.net.URL;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.util.*;
/**

6
src/java/org/apache/solr/handler/CSVRequestHandler.java
View File

@ -18,10 +18,10 @@
package org.apache.solr.handler;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.ContentStream;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.util.StrUtils;

19
src/java/org/apache/solr/request/DisMaxRequestHandler.java → src/java/org/apache/solr/handler/DisMaxRequestHandler.java
View File

@ -15,11 +15,11 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.handler;
import static org.apache.solr.request.SolrParams.FACET;
import static org.apache.solr.request.SolrParams.FQ;
import static org.apache.solr.request.SolrParams.Q;
import static org.apache.solr.common.params.SolrParams.FACET;
import static org.apache.solr.common.params.SolrParams.FQ;
import static org.apache.solr.common.params.SolrParams.Q;
import java.net.MalformedURLException;
import java.net.URL;
@ -33,18 +33,21 @@ import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.DisMaxParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SimpleFacets;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.DocListAndSet;
import org.apache.solr.search.DocSet;
import org.apache.solr.search.QueryParsing;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SolrQueryParser;
import org.apache.solr.util.DisMaxParams;
import org.apache.solr.util.HighlightingUtils;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SolrPluginUtils;
/**

6
src/java/org/apache/solr/handler/DumpRequestHandler.java
View File

@ -21,11 +21,11 @@ import java.io.IOException;
import java.util.ArrayList;
import org.apache.commons.io.IOUtils;
import org.apache.solr.util.ContentStream;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
public class DumpRequestHandler extends RequestHandlerBase
{

20
src/java/org/apache/solr/handler/MoreLikeThisHandler.java
View File

@ -17,9 +17,9 @@
package org.apache.solr.handler;
import static org.apache.solr.request.SolrParams.DF;
import static org.apache.solr.request.SolrParams.FACET;
import static org.apache.solr.request.SolrParams.FQ;
import static org.apache.solr.common.params.SolrParams.DF;
import static org.apache.solr.common.params.SolrParams.FACET;
import static org.apache.solr.common.params.SolrParams.FQ;
import java.io.IOException;
import java.io.Reader;
@ -39,10 +39,15 @@ import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.similar.MoreLikeThis;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.MoreLikeThisParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.MoreLikeThisParams.TermStyle;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.request.SimpleFacets;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
@ -51,12 +56,7 @@ import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList;
import org.apache.solr.search.QueryParsing;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.ContentStream;
import org.apache.solr.util.MoreLikeThisParams;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import org.apache.solr.util.SolrPluginUtils;
import org.apache.solr.util.MoreLikeThisParams.TermStyle;
/**
* Solr MoreLikeThis --

8
src/java/org/apache/solr/handler/RequestHandlerBase.java
View File

@ -19,16 +19,16 @@ package org.apache.solr.handler;
import java.net.URL;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SolrPluginUtils;
import org.apache.solr.util.SimpleOrderedMap;
/**
*

6
src/java/org/apache/solr/handler/RequestHandlerUtils.java
View File

@ -20,12 +20,12 @@ package org.apache.solr.handler;
import java.io.IOException;
import java.util.HashMap;
import org.apache.solr.request.MapSolrParams;
import org.apache.solr.request.SolrParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.util.UpdateParams;
/**
* Common helper functions for RequestHandlers

6
src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java
View File

@ -25,12 +25,12 @@ import org.apache.lucene.search.spell.SpellChecker;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import java.io.File;
import java.io.IOException;

16
src/java/org/apache/solr/request/StandardRequestHandler.java → src/java/org/apache/solr/handler/StandardRequestHandler.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.handler;
import org.apache.lucene.search.*;
@ -24,18 +24,20 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import org.apache.solr.util.MoreLikeThisParams;
import org.apache.solr.util.StrUtils;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.HighlightingUtils;
import org.apache.solr.util.SolrPluginUtils;
import org.apache.solr.request.SimpleFacets;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.search.*;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.MoreLikeThisParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.handler.MoreLikeThisHandler;
import org.apache.solr.handler.RequestHandlerBase;
import static org.apache.solr.request.SolrParams.*;
import static org.apache.solr.common.params.SolrParams.*;
/**
* @author yonik

10
src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
View File

@ -25,9 +25,12 @@ import java.util.List;
import java.util.logging.Logger;
import org.apache.commons.io.IOUtils;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.XML;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.util.ContentStream;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
@ -37,10 +40,7 @@ import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.DocumentBuilder;
import org.apache.solr.update.UpdateHandler;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.StrUtils;
import org.apache.solr.util.XML;
import org.apache.solr.util.SimpleOrderedMap;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;

8
src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
View File

@ -42,10 +42,12 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.PriorityQueue;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.RequestHandlerUtils;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.schema.FieldType;
@ -54,8 +56,6 @@ import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.DocList;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SolrQueryParser;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
/**
* This handler exposes the internal lucene index. It is inspired by and

4
src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
View File

@ -21,14 +21,14 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Map;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.core.SolrInfoRegistry;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.RequestHandlerUtils;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.SimpleOrderedMap;
/**
* similar to "admin/registry.jsp"

4
src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
View File

@ -20,11 +20,11 @@ package org.apache.solr.handler.admin;
import java.io.IOException;
import java.util.Properties;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
/**
* @author ryan

6
src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
View File

@ -31,6 +31,9 @@ import java.util.Date;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.lucene.LucenePackage;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.XML;
import org.apache.solr.core.Config;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.RequestHandlerBase;
@ -38,9 +41,6 @@ import org.apache.solr.handler.RequestHandlerUtils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import org.apache.solr.util.XML;
/**

4
src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
View File

@ -22,12 +22,12 @@ import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.RequestHandlerUtils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
/**
* Copied from "admin/threaddump.jsp"

4
src/java/org/apache/solr/request/JSONResponseWriter.java
View File

@ -19,13 +19,13 @@ package org.apache.solr.request;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.schema.TextField;
import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import java.io.IOException;
import java.io.Writer;

4
src/java/org/apache/solr/request/LocalSolrQueryRequest.java
View File

@ -17,7 +17,9 @@
package org.apache.solr.request;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.params.MultiMapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import java.util.Map;

2
src/java/org/apache/solr/request/PythonResponseWriter.java
View File

@ -20,7 +20,7 @@ package org.apache.solr.request;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.util.NamedList;
public class PythonResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_PYTHON_ASCII="text/x-python;charset=US-ASCII";

2
src/java/org/apache/solr/request/QueryResponseWriter.java
View File

@ -20,7 +20,7 @@ package org.apache.solr.request;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.util.NamedList;
/**
* Implementations of <code>QueryResponseWriter</code> are used to format responses to query requests.

2
src/java/org/apache/solr/request/RubyResponseWriter.java
View File

@ -19,7 +19,7 @@ package org.apache.solr.request;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.util.NamedList;
public class RubyResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_RUBY_UTF8="text/x-ruby;charset=UTF-8";

2
src/java/org/apache/solr/request/ServletSolrParams.java
View File

@ -19,6 +19,8 @@ package org.apache.solr.request;
import javax.servlet.ServletRequest;
import org.apache.solr.common.params.MultiMapSolrParams;
/**
* @author yonik
* @version $Id$

8
src/java/org/apache/solr/request/SimpleFacets.java
View File

@ -23,18 +23,18 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.search.*;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.request.SolrParams;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.schema.BoolField;
import org.apache.solr.search.*;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.BoundedTreeSet;
import org.apache.solr.util.SimpleOrderedMap;
import java.io.IOException;
import java.util.Arrays;

3
src/java/org/apache/solr/request/SolrQueryRequest.java
View File

@ -19,7 +19,8 @@ package org.apache.solr.request;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.util.ContentStream;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.core.SolrCore;
import java.util.Map;

5
src/java/org/apache/solr/request/SolrQueryRequestBase.java
View File

@ -18,11 +18,12 @@
package org.apache.solr.request;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.ContentStream;
import org.apache.solr.util.RefCounted;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import java.util.Iterator;
import java.util.Map;

4
src/java/org/apache/solr/request/SolrQueryResponse.java
View File

@ -17,8 +17,8 @@
package org.apache.solr.request;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import java.util.*;

2
src/java/org/apache/solr/request/SolrRequestHandler.java
View File

@ -17,7 +17,7 @@
package org.apache.solr.request;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoMBean;
/**

2
src/java/org/apache/solr/request/TextResponseWriter.java
View File

@ -18,10 +18,10 @@
package org.apache.solr.request;
import org.apache.lucene.document.Document;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.DocList;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.NamedList;
import java.io.IOException;
import java.io.Writer;

2
src/java/org/apache/solr/request/XMLResponseWriter.java
View File

@ -20,7 +20,7 @@ package org.apache.solr.request;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.util.NamedList;
import org.apache.solr.common.util.NamedList;
/**
* @author yonik

4
src/java/org/apache/solr/request/XMLWriter.java
View File

@ -17,8 +17,8 @@
package org.apache.solr.request;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.XML;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.XML;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.DocList;
import org.apache.solr.search.DocIterator;

3
src/java/org/apache/solr/request/XSLTResponseWriter.java
View File

@ -31,8 +31,9 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.xslt.TransformerProvider;
/** QueryResponseWriter which captures the output of the XMLWriter

2
src/java/org/apache/solr/schema/CompressableField.java
View File

@ -20,6 +20,8 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.*;
import java.util.Map;

2
src/java/org/apache/solr/schema/DateField.java
View File

@ -17,7 +17,7 @@
package org.apache.solr.schema;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.lucene.document.Fieldable;

2
src/java/org/apache/solr/schema/FieldType.java
View File

@ -30,7 +30,7 @@ import org.apache.solr.search.Sorting;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.analysis.SolrAnalyzer;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import java.util.logging.Logger;
import java.util.Map;

4
src/java/org/apache/solr/schema/IndexSchema.java
View File

@ -23,14 +23,14 @@ import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.Similarity;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrException;
import org.apache.solr.core.Config;
import org.apache.solr.analysis.TokenFilterFactory;
import org.apache.solr.analysis.TokenizerChain;
import org.apache.solr.analysis.TokenizerFactory;
import org.apache.solr.search.SolrQueryParser;
import org.apache.solr.util.DOMUtil;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;

4
src/java/org/apache/solr/search/CacheConfig.java
View File

@ -22,8 +22,8 @@ import org.w3c.dom.NodeList;
import java.util.Map;
import org.apache.solr.util.DOMUtil;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.Config;

2
src/java/org/apache/solr/search/DocSet.java
View File

@ -17,7 +17,7 @@
package org.apache.solr.search;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import org.apache.solr.util.OpenBitSet;
import java.util.BitSet;

6
src/java/org/apache/solr/search/LRUCache.java
View File

@ -17,10 +17,10 @@
package org.apache.solr.search;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;

4
src/java/org/apache/solr/search/QueryParsing.java
View File

@ -23,12 +23,12 @@ import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.Term;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.schema.FieldType;
import org.apache.solr.request.SolrParams;
import java.util.ArrayList;
import java.util.List;

4
src/java/org/apache/solr/search/SolrIndexSearcher.java
View File

@ -25,15 +25,15 @@ import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.PriorityQueue;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.core.SolrInfoRegistry;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.OpenBitSet;
import org.apache.solr.util.SimpleOrderedMap;
import java.io.IOException;
import java.net.URL;

2
src/java/org/apache/solr/tst/OldRequestHandler.java
View File

@ -26,9 +26,9 @@ import java.io.IOException;
import java.net.URL;
import org.apache.solr.util.StrUtils;
import org.apache.solr.util.NamedList;
import org.apache.solr.search.DocSlice;
import org.apache.solr.search.QueryParsing;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.SolrQueryResponse;

4
src/java/org/apache/solr/tst/TestRequestHandler.java
View File

@ -29,11 +29,11 @@ import java.util.logging.Level;
import java.net.URL;
import org.apache.solr.util.StrUtils;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.OpenBitSet;
import org.apache.solr.search.*;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;

6
src/java/org/apache/solr/update/DirectUpdateHandler.java
View File

@ -37,11 +37,11 @@ import java.net.URL;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.QueryParsing;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import org.apache.solr.update.UpdateHandler;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
/**
* <code>DirectUpdateHandler</code> implements an UpdateHandler where documents are added

6
src/java/org/apache/solr/update/DirectUpdateHandler2.java
View File

@ -47,11 +47,11 @@ import java.net.URL;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.QueryParsing;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SimpleOrderedMap;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrException;
/**
* <code>DirectUpdateHandler2</code> implements an UpdateHandler where documents are added

2
src/java/org/apache/solr/update/DocumentBuilder.java
View File

@ -23,7 +23,7 @@ import java.util.List;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;

3
src/java/org/apache/solr/update/UpdateHandler.java
View File

@ -31,10 +31,11 @@ import java.util.Vector;
import java.io.IOException;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.DOMUtil;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.schema.FieldType;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.core.*;
import javax.xml.xpath.XPathConstants;

3
src/java/org/apache/solr/util/AbstractSolrTestCase.java
View File

@ -18,7 +18,8 @@
package org.apache.solr.util;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.XML;
import org.apache.solr.request.*;
import org.apache.solr.util.TestHarness;

5
src/java/org/apache/solr/util/HighlightingUtils.java
View File

@ -27,6 +27,11 @@ import java.util.LinkedList;
import java.util.ArrayList;
import java.util.ListIterator;
import org.apache.solr.common.params.DefaultSolrParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.request.*;
import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList;

11
src/java/org/apache/solr/util/SolrPluginUtils.java
View File

@ -23,13 +23,16 @@ import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.AppendedSolrParams;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.DefaultSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.DefaultSolrParams;
import org.apache.solr.request.AppendedSolrParams;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.*;

2
src/java/org/apache/solr/util/TestHarness.java
View File

@ -17,6 +17,8 @@
package org.apache.solr.util;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.XML;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.XmlUpdateRequestHandler;

5
src/test/org/apache/solr/BasicFunctionalityTest.java
View File

@ -20,6 +20,11 @@ package org.apache.solr;
import org.apache.lucene.document.*;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.BooleanQuery;
import org.apache.solr.common.params.AppendedSolrParams;
import org.apache.solr.common.params.DefaultSolrParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.search.*;
import org.apache.solr.handler.*;

2
src/test/org/apache/solr/EchoParamsTest.java
View File

@ -61,7 +61,7 @@ public class EchoParamsTest extends AbstractSolrTestCase {
);
assertQ(req("foo"),HEADER_XPATH + "/lst[@name='params']/str[@name='fl'][.='implicit']");
assertQ(req("foo"),HEADER_XPATH + "/str[@name='handler'][.='org.apache.solr.request.StandardRequestHandler']");
assertQ(req("foo"),HEADER_XPATH + "/str[@name='handler'][.='org.apache.solr.handler.StandardRequestHandler']");
}
}

3
src/test/org/apache/solr/OutputWriterTest.java
View File

@ -19,11 +19,12 @@ package org.apache.solr;
import java.io.IOException;
import java.io.Writer;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.QueryResponseWriter;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.TestHarness;
/** Tests the ability to configure multiple query output writers, and select those

5
src/test/org/apache/solr/util/SolrDocumentTest.java → src/test/org/apache/solr/common/SolrDocumentTest.java
View File

@ -15,12 +15,15 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
import junit.framework.TestCase;
/**

10
src/test/org/apache/solr/util/SolrParamTest.java → src/test/org/apache/solr/common/params/SolrParamTest.java
View File

@ -15,17 +15,17 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.params;
import junit.framework.TestCase;
import java.util.HashMap;
import java.util.Map;
import org.apache.solr.core.SolrException;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.MapSolrParams;
import org.apache.solr.request.DefaultSolrParams;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.DefaultSolrParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
/**
* @author ryan

3
src/test/org/apache/solr/util/ContentStreamTest.java → src/test/org/apache/solr/common/util/ContentStreamTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import java.io.ByteArrayInputStream;
import java.io.File;
@ -28,6 +28,7 @@ import java.io.StringReader;
import java.net.URL;
import org.apache.commons.io.IOUtils;
import org.apache.solr.common.util.ContentStreamBase;
import junit.framework.TestCase;

4
src/test/org/apache/solr/util/IteratorChainTest.java → src/test/org/apache/solr/common/util/IteratorChainTest.java
View File

@ -15,12 +15,14 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.solr.common.util.IteratorChain;
import junit.framework.TestCase;
public class IteratorChainTest extends TestCase {

4
src/test/org/apache/solr/util/TestXMLEscaping.java → src/test/org/apache/solr/common/util/TestXMLEscaping.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.util;
package org.apache.solr.common.util;
import junit.framework.TestCase;
@ -24,6 +24,8 @@ import java.io.StringWriter;
import java.util.Random;
import java.util.BitSet;
import org.apache.solr.common.util.XML;
/** Test (some of the) character escaping functions of the XML class
* $Id$
*/

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

@ -17,8 +17,8 @@
package org.apache.solr.core;
import org.apache.solr.handler.StandardRequestHandler;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.StandardRequestHandler;
import org.apache.solr.util.AbstractSolrTestCase;
public class RequestHandlersTest extends AbstractSolrTestCase {

8
src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
View File

@ -21,14 +21,14 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.apache.solr.common.params.MultiMapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.MultiMapSolrParams;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.ContentStream;
import org.apache.solr.util.ContentStreamBase;
/**

4
src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
View File

@ -20,10 +20,10 @@ package org.apache.solr.handler;
import java.util.HashMap;
import java.util.Map;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.MapSolrParams;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.AbstractSolrTestCase;

6
src/test/org/apache/solr/handler/TestCSVLoader.java
View File

@ -18,11 +18,11 @@
package org.apache.solr.handler;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.ContentStream;
import org.apache.solr.util.ContentStreamBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.core.SolrException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
import java.io.*;
import java.util.List;

2
src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java
View File

@ -22,7 +22,7 @@ import java.lang.management.OperatingSystemMXBean;
import junit.framework.TestCase;
import org.apache.solr.util.SimpleOrderedMap;
import org.apache.solr.common.util.SimpleOrderedMap;
public class SystemInfoHandlerTest extends TestCase {

4
src/test/org/apache/solr/schema/IndexSchemaTest.java
View File

@ -20,10 +20,10 @@ package org.apache.solr.schema;
import java.util.HashMap;
import java.util.Map;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.MapSolrParams;
import org.apache.solr.request.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.AbstractSolrTestCase;

2
src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java
View File

@ -17,7 +17,7 @@
package org.apache.solr.servlet;
import org.apache.solr.request.SolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.util.AbstractSolrTestCase;

6
src/test/org/apache/solr/servlet/SolrRequestParserTest.java
View File

@ -31,12 +31,12 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.io.IOUtils;
import org.apache.solr.common.params.MultiMapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.MultiMapSolrParams;
import org.apache.solr.request.SolrParams;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.ContentStream;
public class SolrRequestParserTest extends AbstractSolrTestCase {

6
src/test/org/apache/solr/update/AutoCommitTest.java
View File

@ -21,14 +21,14 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.XmlUpdateRequestHandler;
import org.apache.solr.util.ContentStream;
import org.apache.solr.request.MapSolrParams;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.ContentStreamBase;
/**
*

6
src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
View File

@ -28,14 +28,14 @@ import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrException;
import org.apache.solr.handler.XmlUpdateRequestHandler;
import org.apache.solr.request.MapSolrParams;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.ContentStream;
/**
*

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

@ -17,8 +17,8 @@
package org.apache.solr.util;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.SolrQueryParser;
import org.apache.solr.util.NamedList;
import org.apache.solr.util.SolrPluginUtils;
import org.apache.solr.util.SolrPluginUtils.DisjunctionMaxQueryParser;

Some files were not shown because too many files have changed in this diff Show More