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

SOLR-1602 -- step 1. Adding new 'response' package and refactoring all response things to this package. NOTE, this will break back-compatibility depricated versions of the moved 1.4 files are added back. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@898152 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley 2010-01-12 02:19:56 +00:00
parent fd6a62e6dd
commit 6f278e589f
127 changed files with 234 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/ruby/solr-ruby/solr/conf/solrconfig.xml
View File

@ -367,10 +367,10 @@
in the request. XMLResponseWriter will be used if nothing is specified here.
The json, python, and ruby writers are also available by default.
<queryResponseWriter name="standard" class="org.apache.solr.request.XMLResponseWriter"/>
<queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
<queryResponseWriter name="standard" class="org.apache.solr.response.XMLResponseWriter"/>
<queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.response.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.response.RubyResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
@ -379,7 +379,7 @@
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
<queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
<queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>

10
client/ruby/solr-ruby/test/conf/solrconfig.xml
View File

@ -349,10 +349,10 @@
in the request. XMLResponseWriter will be used if nothing is specified here.
The json, python, and ruby writers are also available by default.
<queryResponseWriter name="standard" class="org.apache.solr.request.XMLResponseWriter"/>
<queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
<queryResponseWriter name="standard" class="org.apache.solr.response.XMLResponseWriter"/>
<queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.response.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.response.RubyResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
@ -361,7 +361,7 @@
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
<queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
<queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>

2
contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java
View File

@ -24,7 +24,7 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.QueryComponent;
import org.apache.solr.handler.component.SearchComponent;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.request.SolrRequestHandler;

14
contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
View File

@ -522,12 +522,12 @@
in the request. XMLResponseWriter will be used if nothing is specified here.
The json, python, and ruby writers are also available by default.
<queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/>
<queryResponseWriter name="xml" class="org.apache.solr.response.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.response.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.response.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.response.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.response.PHPSerializedResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
@ -536,7 +536,7 @@
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
<queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
<queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>

4
contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
View File

@ -31,9 +31,9 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.RequestHandlerUtils;
import org.apache.solr.request.RawResponseWriter;
import org.apache.solr.response.RawResponseWriter;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.update.processor.UpdateRequestProcessorChain;

2
contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
View File

@ -23,7 +23,7 @@ import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;

2
contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
View File

@ -18,7 +18,7 @@ package org.apache.solr.handler;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.common.util.NamedList;

1
contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java
View File

@ -17,6 +17,7 @@
package org.apache.solr.request;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.DocSlice;
import org.apache.solr.common.SolrDocumentList;

2
contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java
View File

@ -22,6 +22,8 @@ import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.SolrResponseBase;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.tools.generic.*;

16
contrib/velocity/src/main/solr/conf/solrconfig.xml
View File

@ -743,23 +743,23 @@
in the request. XMLResponseWriter will be used if nothing is specified here.
The json, python, and ruby writers are also available by default.
<queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/>
<queryResponseWriter name="xml" class="org.apache.solr.response.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.response.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.response.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.response.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.response.PHPSerializedResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
<queryResponseWriter name="velocity" class="org.apache.solr.request.VelocityResponseWriter"/>
<queryResponseWriter name="velocity" class="org.apache.solr.response.VelocityResponseWriter"/>
<!-- XSLT response writer transforms the XML output by any xslt file found
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
<queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
<queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>

14
example/example-DIH/solr/db/conf/solrconfig.xml
View File

@ -674,12 +674,12 @@
in the request. XMLResponseWriter will be used if nothing is specified here.
The json, python, and ruby writers are also available by default.
<queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/>
<queryResponseWriter name="xml" class="org.apache.solr.response.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.response.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.response.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.response.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.response.PHPSerializedResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
@ -688,7 +688,7 @@
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
<queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
<queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>

14
example/example-DIH/solr/mail/conf/solrconfig.xml
View File

@ -768,12 +768,12 @@
in the request. XMLResponseWriter will be used if nothing is specified here.
The json, python, and ruby writers are also available by default.
<queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/>
<queryResponseWriter name="xml" class="org.apache.solr.response.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.response.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.response.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.response.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.response.PHPSerializedResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
@ -782,7 +782,7 @@
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
<queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
<queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>

14
example/example-DIH/solr/rss/conf/solrconfig.xml
View File

@ -673,12 +673,12 @@
in the request. XMLResponseWriter will be used if nothing is specified here.
The json, python, and ruby writers are also available by default.
<queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/>
<queryResponseWriter name="xml" class="org.apache.solr.response.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.response.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.response.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.response.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.response.PHPSerializedResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
@ -687,7 +687,7 @@
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
<queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
<queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>

14
example/solr/conf/solrconfig.xml
View File

@ -1001,12 +1001,12 @@
The following response writers are implicitly configured unless
overridden...
<queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.request.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.request.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.request.PHPSerializedResponseWriter"/>
<queryResponseWriter name="xml" class="org.apache.solr.response.XMLResponseWriter" default="true"/>
<queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
<queryResponseWriter name="python" class="org.apache.solr.response.PythonResponseWriter"/>
<queryResponseWriter name="ruby" class="org.apache.solr.response.RubyResponseWriter"/>
<queryResponseWriter name="php" class="org.apache.solr.response.PHPResponseWriter"/>
<queryResponseWriter name="phps" class="org.apache.solr.response.PHPSerializedResponseWriter"/>
Custom response writers can be declared as needed...
@ -1017,7 +1017,7 @@
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
<queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
<queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>

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

@ -23,7 +23,7 @@ import org.apache.solr.search.DocIterator;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import java.util.List;

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

@ -21,8 +21,8 @@ import org.apache.solr.common.SolrException;
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.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.plugin.SolrCoreAware;
import org.apache.solr.util.plugin.PluginInfoInitialized;
import org.slf4j.Logger;

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

@ -25,7 +25,7 @@ import org.apache.solr.handler.component.SearchComponent;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.QueryResponseWriter;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.search.CacheConfig;
import org.apache.solr.search.FastLRUCache;

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

@ -33,6 +33,16 @@ import org.apache.solr.handler.component.*;
import org.apache.solr.highlight.DefaultSolrHighlighter;
import org.apache.solr.highlight.SolrHighlighter;
import org.apache.solr.request.*;
import org.apache.solr.response.BinaryResponseWriter;
import org.apache.solr.response.JSONResponseWriter;
import org.apache.solr.response.PHPResponseWriter;
import org.apache.solr.response.PHPSerializedResponseWriter;
import org.apache.solr.response.PythonResponseWriter;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.RawResponseWriter;
import org.apache.solr.response.RubyResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.response.XMLResponseWriter;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.QParserPlugin;
import org.apache.solr.search.SolrFieldCacheMBean;

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

@ -47,8 +47,8 @@ import org.apache.solr.common.util.FileUtils;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.handler.component.SearchComponent;
import org.apache.solr.request.QueryResponseWriter;
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;
@ -63,7 +63,7 @@ public class SolrResourceLoader implements ResourceLoader
static final String project = "solr";
static final String base = "org.apache" + "." + project;
static final String[] packages = {"","analysis.","schema.","handler.","search.","update.","core.","request.","update.processor.","util.", "spelling.", "handler.component.", "handler.dataimport."};
static final String[] packages = {"","analysis.","schema.","handler.","search.","update.","core.","response","request.","update.processor.","util.", "spelling.", "handler.component.", "handler.dataimport." };
private URLClassLoader classLoader;
private final String instanceDir;

2
src/java/org/apache/solr/handler/AnalysisRequestHandler.java
View File

@ -27,7 +27,7 @@ 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.response.SolrQueryResponse;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;

2
src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
View File

@ -30,7 +30,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.FieldType;
import java.io.IOException;

2
src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
View File

@ -26,7 +26,7 @@ import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.common.util.ContentStream;
import static org.apache.solr.handler.XmlUpdateRequestHandler.COMMIT_WITHIN;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;

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

@ -18,7 +18,7 @@
package org.apache.solr.handler;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.SolrParams;
@ -54,17 +54,17 @@ public class CSVRequestHandler extends ContentStreamHandlerBase {
@Override
public String getVersion() {
return "$Revision:$";
return "$Revision$";
}
@Override
public String getSourceId() {
return "$Id:$";
return "$Id$";
}
@Override
public String getSource() {
return "$URL:$";
return "$URL$";
}
}

2
src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
View File

@ -21,7 +21,7 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.update.processor.UpdateRequestProcessorChain;

2
src/java/org/apache/solr/handler/ContentStreamLoader.java
View File

@ -19,7 +19,7 @@ package org.apache.solr.handler;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
/**

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

@ -25,7 +25,7 @@ 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.response.SolrQueryResponse;
public class DumpRequestHandler extends RequestHandlerBase
{

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

@ -51,7 +51,7 @@ import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SimpleFacets;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.DocIterator;

2
src/java/org/apache/solr/handler/PingRequestHandler.java
View File

@ -24,8 +24,8 @@ import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
/**

4
src/java/org/apache/solr/handler/ReplicationHandler.java
View File

@ -26,9 +26,9 @@ import org.apache.solr.common.util.FastOutputStream;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.*;
import org.apache.solr.request.BinaryQueryResponseWriter;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.BinaryQueryResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.update.DirectUpdateHandler2;
import org.apache.solr.util.RefCounted;

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

@ -25,8 +25,8 @@ import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.DocSet;
import org.apache.solr.util.SolrPluginUtils;
import org.apache.lucene.queryParser.ParseException;
@ -85,8 +85,8 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo
*
* @param args The {@link org.apache.solr.common.util.NamedList} to initialize from
*
* @see #handleRequest(org.apache.solr.request.SolrQueryRequest, org.apache.solr.request.SolrQueryResponse)
* @see #handleRequestBody(org.apache.solr.request.SolrQueryRequest, org.apache.solr.request.SolrQueryResponse)
* @see #handleRequest(org.apache.solr.request.SolrQueryRequest, org.apache.solr.response.SolrQueryResponse)
* @see #handleRequestBody(org.apache.solr.request.SolrQueryRequest, org.apache.solr.response.SolrQueryResponse)
* @see org.apache.solr.util.SolrPluginUtils#setDefaults(org.apache.solr.request.SolrQueryRequest, org.apache.solr.common.params.SolrParams, org.apache.solr.common.params.SolrParams, org.apache.solr.common.params.SolrParams)
* @see SolrParams#toSolrParams(org.apache.solr.common.util.NamedList)
*

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

@ -24,7 +24,7 @@ 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.response.SolrQueryResponse;
import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.RollbackUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;

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

@ -26,7 +26,7 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;

2
src/java/org/apache/solr/handler/XMLLoader.java
View File

@ -22,7 +22,7 @@ import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.RollbackUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.SolrException;

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

@ -25,7 +25,7 @@ import org.apache.solr.common.util.XML;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.update.processor.UpdateRequestProcessorChain;
import org.slf4j.Logger;

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

@ -24,8 +24,8 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.plugin.SolrCoreAware;
/**

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

@ -30,8 +30,8 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.core.DirectoryFactory;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.RefCounted;
import org.apache.solr.update.MergeIndexesCommand;

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

@ -57,7 +57,7 @@ import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.Base64;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;

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

@ -28,7 +28,7 @@ import org.apache.solr.core.SolrInfoMBean;
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.response.SolrQueryResponse;
/**
* similar to "admin/registry.jsp"

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

@ -22,7 +22,7 @@ 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.response.SolrQueryResponse;
/**
* @version $Id$

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

@ -36,9 +36,9 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.RequestHandlerUtils;
import org.apache.solr.request.RawResponseWriter;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.RawResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
/**
* This handler uses the RawResponseWriter to give client access to

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

@ -37,7 +37,7 @@ import org.apache.solr.common.util.XML;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -27,7 +27,7 @@ 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.response.SolrQueryResponse;
/**
* Copied from "admin/threaddump.jsp"

2
src/java/org/apache/solr/handler/component/QueryComponent.java
View File

@ -34,7 +34,7 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.*;

2
src/java/org/apache/solr/handler/component/ResponseBuilder.java
View File

@ -23,7 +23,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.RTimer;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.DocListAndSet;
import org.apache.solr.search.QParser;
import org.apache.solr.search.SortSpec;

2
src/java/org/apache/solr/handler/component/SearchComponent.java
View File

@ -25,7 +25,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
/**

2
src/java/org/apache/solr/handler/component/SearchHandler.java
View File

@ -26,7 +26,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.ShardParams;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrResponse;

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

@ -19,6 +19,7 @@ package org.apache.solr.request;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.response.SolrQueryResponse;
/**
* Implementations of <code>SolrRequestHandler</code> are called to handle query requests.

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

@ -22,6 +22,7 @@ import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.XML;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.DocList;
import org.apache.solr.search.DocIterator;
@ -261,19 +262,6 @@ final public class XMLWriter {
/**
* Begins the writing of an XML tag output, using the provided
* <code>tag</code> as the name, with an optional <code>name</code>
* attribute, set to the provided value of name. If <code>closeTag</code> is
* set to true, then the tag is written with no internal text value.
*
* @param tag The name of the XML tag to write.
* @param name If provided (not set to null), a &quot;name&quot; attribute is
* written to the tag, with the value set to the provided parameter.
* @param closeTag If set to true, then the tag is closed, without writing any
* internal text value.
* @throws IOException If the underlying {@link #writer} throws an Exception.
*/
public void startTag(String tag, String name, boolean closeTag) throws IOException {
if (doIndent) indent();

3
src/java/org/apache/solr/request/BaseResponseWriter.java → src/java/org/apache/solr/response/BaseResponseWriter.java
View File

@ -15,13 +15,14 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.DocList;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.DocIterator;

4
src/java/org/apache/solr/request/BinaryQueryResponseWriter.java → src/java/org/apache/solr/response/BinaryQueryResponseWriter.java
View File

@ -1,4 +1,4 @@
package org.apache.solr.request;
package org.apache.solr.response;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -21,6 +21,8 @@ import java.io.Writer;
import java.io.OutputStream;
import java.io.IOException;
import org.apache.solr.request.SolrQueryRequest;
/**
* Implementations of <code>BinaryQueryResponseWriter</code> are used to
* write response in binary format

3
src/java/org/apache/solr/request/BinaryResponseWriter.java → src/java/org/apache/solr/response/BinaryResponseWriter.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
@ -22,6 +22,7 @@ import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.JavaBinCodec;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.*;
import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList;

3
src/java/org/apache/solr/request/GenericBinaryResponseWriter.java → src/java/org/apache/solr/response/GenericBinaryResponseWriter.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.OutputStream;
import java.io.IOException;
@ -23,6 +23,7 @@ import java.io.Writer;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.request.SolrQueryRequest;
/**
*

3
src/java/org/apache/solr/request/GenericTextResponseWriter.java → src/java/org/apache/solr/response/GenericTextResponseWriter.java
View File

@ -15,13 +15,14 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.request.SolrQueryRequest;
/**
*

3
src/java/org/apache/solr/request/JSONResponseWriter.java → src/java/org/apache/solr/response/JSONResponseWriter.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
@ -25,6 +25,7 @@ import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.schema.TextField;
import org.apache.solr.search.DocIterator;

3
src/java/org/apache/solr/request/PHPResponseWriter.java → src/java/org/apache/solr/response/PHPResponseWriter.java
View File

@ -15,12 +15,13 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
public class PHPResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_PHP_UTF8="text/x-php;charset=UTF-8";

3
src/java/org/apache/solr/request/PHPSerializedResponseWriter.java → src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
@ -26,6 +26,7 @@ import org.apache.lucene.document.Fieldable;
import org.apache.lucene.util.UnicodeUtil;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList;

3
src/java/org/apache/solr/request/PythonResponseWriter.java → src/java/org/apache/solr/response/PythonResponseWriter.java
View File

@ -15,12 +15,13 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
public class PythonResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_PYTHON_ASCII="text/x-python;charset=US-ASCII";

3
src/java/org/apache/solr/request/QueryResponseWriter.java → src/java/org/apache/solr/response/QueryResponseWriter.java
View File

@ -15,12 +15,13 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
/**

3
src/java/org/apache/solr/request/RawResponseWriter.java → src/java/org/apache/solr/response/RawResponseWriter.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.IOException;
import java.io.Writer;
@ -23,6 +23,7 @@ import java.io.Writer;
import org.apache.commons.io.IOUtils;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
/**
* Writes a ContentStream directly to the output.

3
src/java/org/apache/solr/request/RubyResponseWriter.java → src/java/org/apache/solr/response/RubyResponseWriter.java
View File

@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
public class RubyResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_RUBY_UTF8="text/x-ruby;charset=UTF-8";

2
src/java/org/apache/solr/request/SolrQueryResponse.java → src/java/org/apache/solr/response/SolrQueryResponse.java
View File

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

3
src/java/org/apache/solr/request/TextResponseWriter.java → src/java/org/apache/solr/response/TextResponseWriter.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import org.apache.lucene.document.Document;
import org.apache.solr.common.params.CommonParams;
@ -23,6 +23,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.FastWriter;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.DocList;
import java.io.IOException;

4
src/java/org/apache/solr/request/XMLResponseWriter.java → src/java/org/apache/solr/response/XMLResponseWriter.java
View File

@ -15,12 +15,14 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.Writer;
import java.io.IOException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.XMLWriter;
/**
* @version $Id$

4
src/java/org/apache/solr/request/XSLTResponseWriter.java → src/java/org/apache/solr/response/XSLTResponseWriter.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.request;
package org.apache.solr.response;
import java.io.BufferedReader;
import java.io.CharArrayReader;
@ -35,6 +35,8 @@ import javax.xml.transform.stream.StreamSource;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.util.xslt.TransformerProvider;
/** QueryResponseWriter which captures the output of the XMLWriter

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

@ -22,7 +22,7 @@ import org.apache.solr.search.function.ValueSource;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.util.BCDUtils;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;

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

@ -18,7 +18,7 @@
package org.apache.solr.schema;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.common.util.Base64;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.document.Field;

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

@ -27,7 +27,7 @@ import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.analysis.SolrAnalyzer;
import java.util.Map;

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

@ -19,8 +19,8 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.ByteFieldSource;

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

@ -25,8 +25,8 @@ import org.apache.lucene.search.TermRangeQuery;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.DateUtil;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.*;
import org.apache.solr.util.DateMathParser;

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

@ -19,8 +19,8 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.function.DoubleFieldSource;
import org.apache.solr.search.function.ValueSource;

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

@ -23,7 +23,7 @@ import org.apache.solr.search.function.FloatFieldSource;
import org.apache.solr.search.function.FileFloatSource;
import org.apache.solr.search.QParser;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.common.SolrException;
import java.util.Map;

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

@ -33,7 +33,7 @@ import org.apache.solr.search.function.OrdFieldSource;
import org.apache.solr.search.Sorting;
import org.apache.solr.search.QParser;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.analysis.SolrAnalyzer;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;

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

@ -22,7 +22,7 @@ import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FloatFieldSource;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;

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

@ -20,8 +20,8 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
import org.apache.lucene.spatial.geohash.GeoHashUtils;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.distance.DistanceUtils;

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

@ -22,7 +22,7 @@ import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.IntFieldSource;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;

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

@ -19,7 +19,7 @@ package org.apache.solr.schema;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
import org.apache.solr.search.function.ValueSource;

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

@ -19,8 +19,8 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.function.IntFieldSource;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.LongFieldSource;

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

@ -26,8 +26,8 @@ import org.apache.lucene.search.SortField;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.VectorValueSource;
import org.apache.solr.search.function.ValueSource;

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

@ -23,8 +23,8 @@ import java.util.Map;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.*;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.function.DocValues;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.SolrIndexReader;

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

@ -21,7 +21,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;

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

@ -19,8 +19,8 @@ package org.apache.solr.schema;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.ShortFieldSource;

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

@ -26,7 +26,7 @@ import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;

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

@ -26,7 +26,7 @@ import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;

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

@ -26,7 +26,7 @@ import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;

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

@ -26,7 +26,7 @@ import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.util.NumberUtils;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
import java.io.IOException;

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

@ -29,8 +29,8 @@ import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.distance.DistanceUtils;

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

@ -21,7 +21,7 @@ import org.apache.lucene.search.SortField;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.function.ValueSource;
import org.apache.solr.search.function.FieldCacheSource;
import org.apache.solr.search.function.DocValues;

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

@ -32,7 +32,7 @@ import org.apache.lucene.analysis.CachingTokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Analyzer;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
import java.util.Map;

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

@ -25,7 +25,7 @@ import org.apache.solr.analysis.TrieTokenizerFactory;
import org.apache.solr.search.function.*;
import org.apache.solr.search.QParser;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.document.Field;
import org.apache.lucene.search.SortField;

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

@ -24,8 +24,8 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.NumericTokenStream;
import org.apache.solr.analysis.*;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
import org.apache.solr.search.QParser;
import org.apache.solr.search.function.*;

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

@ -24,8 +24,8 @@ import java.util.UUID;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.TextResponseWriter;
import org.apache.solr.request.XMLWriter;
import org.apache.solr.response.TextResponseWriter;
/**
* This FieldType accepts UUID string values, as well as the special value

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

@ -30,8 +30,8 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
/**
* @version $Id$

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

@ -36,7 +36,7 @@ import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
/**
* @version $Id$

2
src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
View File

@ -25,7 +25,7 @@ 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.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;

2
src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java
View File

@ -20,7 +20,7 @@ package org.apache.solr.update.processor;
import java.io.IOException;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;

2
src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java
View File

@ -29,7 +29,7 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;

2
src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java
View File

@ -18,7 +18,7 @@
package org.apache.solr.update.processor;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.plugin.PluginInfoInitialized;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrCore;

2
src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java
View File

@ -20,7 +20,7 @@ package org.apache.solr.update.processor;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
import org.apache.solr.util.plugin.SolrCoreAware;

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

@ -35,7 +35,7 @@ import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.SolrCore;
import org.apache.solr.highlight.SolrHighlighter;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.*;

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

@ -27,9 +27,9 @@ import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.handler.XmlUpdateRequestHandler;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.QueryResponseWriter;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;

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