You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2010/01/12 03:20:01 UTC
svn commit: r898152 [1/2] - in /lucene/solr/trunk:
client/ruby/solr-ruby/solr/conf/ client/ruby/solr-ruby/test/conf/
contrib/clustering/src/test/java/org/apache/solr/handler/clustering/
contrib/clustering/src/test/resources/solr/conf/ contrib/dataimpor...
Author: ryan
Date: Tue Jan 12 02:19:56 2010
New Revision: 898152
URL: http://svn.apache.org/viewvc?rev=898152&view=rev
Log:
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.
Added:
lucene/solr/trunk/src/java/org/apache/solr/response/
lucene/solr/trunk/src/java/org/apache/solr/response/BaseResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/BaseResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/BinaryResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/GenericBinaryResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/GenericBinaryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/GenericTextResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/GenericTextResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/JSONResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/PHPResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/PHPResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/PythonResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/PythonResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/QueryResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/QueryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/RubyResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/RubyResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/SolrQueryResponse.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java
lucene/solr/trunk/src/java/org/apache/solr/response/TextResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/TextResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/XMLResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/XMLResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/response/XSLTResponseWriter.java
- copied, changed from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/XSLTResponseWriter.java
Removed:
lucene/solr/trunk/src/java/org/apache/solr/request/BaseResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/GenericBinaryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/GenericTextResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/PHPResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/PythonResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/QueryResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/RubyResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java
lucene/solr/trunk/src/java/org/apache/solr/request/TextResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/XMLResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/request/XSLTResponseWriter.java
Modified:
lucene/solr/trunk/client/ruby/solr-ruby/solr/conf/solrconfig.xml
lucene/solr/trunk/client/ruby/solr-ruby/test/conf/solrconfig.xml
lucene/solr/trunk/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java
lucene/solr/trunk/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java
lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java
lucene/solr/trunk/contrib/velocity/src/main/solr/conf/solrconfig.xml
lucene/solr/trunk/example/example-DIH/solr/db/conf/solrconfig.xml
lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml
lucene/solr/trunk/example/example-DIH/solr/rss/conf/solrconfig.xml
lucene/solr/trunk/example/solr/conf/solrconfig.xml
lucene/solr/trunk/src/java/org/apache/solr/core/QuerySenderListener.java
lucene/solr/trunk/src/java/org/apache/solr/core/RequestHandlers.java
lucene/solr/trunk/src/java/org/apache/solr/core/SolrConfig.java
lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamLoader.java
lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/PingRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java
lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java
lucene/solr/trunk/src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java
lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/AdminHandlers.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/solr/trunk/src/java/org/apache/solr/handler/component/ResponseBuilder.java
lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchComponent.java
lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchHandler.java
lucene/solr/trunk/src/java/org/apache/solr/request/SolrRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java
lucene/solr/trunk/src/java/org/apache/solr/schema/BCDIntField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/BinaryField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/BoolField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/ByteField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/DateField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/DoubleField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/ExternalFileField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/FieldType.java
lucene/solr/trunk/src/java/org/apache/solr/schema/FloatField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/GeoHashField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/IntField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/LegacyDateField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/LongField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/PointType.java
lucene/solr/trunk/src/java/org/apache/solr/schema/RandomSortField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/SchemaField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/ShortField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/SortableDoubleField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/SortableFloatField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/SortableIntField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/SortableLongField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/SpatialTileField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/StrField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/TextField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/TrieDateField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/TrieField.java
lucene/solr/trunk/src/java/org/apache/solr/schema/UUIDField.java
lucene/solr/trunk/src/java/org/apache/solr/tst/OldRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/tst/TestRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
lucene/solr/trunk/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java
lucene/solr/trunk/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java
lucene/solr/trunk/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java
lucene/solr/trunk/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java
lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/solr/trunk/src/java/org/apache/solr/util/TestHarness.java
lucene/solr/trunk/src/test/org/apache/solr/BasicFunctionalityTest.java
lucene/solr/trunk/src/test/org/apache/solr/OutputWriterTest.java
lucene/solr/trunk/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java
lucene/solr/trunk/src/test/org/apache/solr/core/ResourceLoaderTest.java
lucene/solr/trunk/src/test/org/apache/solr/core/SolrCoreTest.java
lucene/solr/trunk/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
lucene/solr/trunk/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
lucene/solr/trunk/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
lucene/solr/trunk/src/test/org/apache/solr/handler/component/TermsComponentTest.java
lucene/solr/trunk/src/test/org/apache/solr/request/JSONWriterTest.java
lucene/solr/trunk/src/test/org/apache/solr/request/TestBinaryResponseWriter.java
lucene/solr/trunk/src/test/org/apache/solr/request/TestWriterPerf.java
lucene/solr/trunk/src/test/org/apache/solr/search/TestRangeQuery.java
lucene/solr/trunk/src/test/org/apache/solr/search/TestSearchPerf.java
lucene/solr/trunk/src/test/org/apache/solr/update/AutoCommitTest.java
lucene/solr/trunk/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java
lucene/solr/trunk/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
lucene/solr/trunk/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig_perf.xml
lucene/solr/trunk/src/test/test-files/solr/crazy-path-to-config.xml
lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
Modified: lucene/solr/trunk/client/ruby/solr-ruby/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/solr/conf/solrconfig.xml?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/solr/conf/solrconfig.xml Tue Jan 12 02:19:56 2010
@@ -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>
Modified: lucene/solr/trunk/client/ruby/solr-ruby/test/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/ruby/solr-ruby/test/conf/solrconfig.xml?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/client/ruby/solr-ruby/test/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/client/ruby/solr-ruby/test/conf/solrconfig.xml Tue Jan 12 02:19:56 2010
@@ -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>
Modified: lucene/solr/trunk/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java (original)
+++ lucene/solr/trunk/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java Tue Jan 12 02:19:56 2010
@@ -24,7 +24,7 @@
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;
Modified: lucene/solr/trunk/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/contrib/clustering/src/test/resources/solr/conf/solrconfig.xml Tue Jan 12 02:19:56 2010
@@ -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>
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java Tue Jan 12 02:19:56 2010
@@ -31,9 +31,9 @@
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;
Modified: lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java (original)
+++ lucene/solr/trunk/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java Tue Jan 12 02:19:56 2010
@@ -23,7 +23,7 @@
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;
Modified: lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java (original)
+++ lucene/solr/trunk/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java Tue Jan 12 02:19:56 2010
@@ -18,7 +18,7 @@
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;
Modified: lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java Tue Jan 12 02:19:56 2010
@@ -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;
Modified: lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -22,6 +22,8 @@
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.*;
Modified: lucene/solr/trunk/contrib/velocity/src/main/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/solr/conf/solrconfig.xml?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/solr/conf/solrconfig.xml Tue Jan 12 02:19:56 2010
@@ -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>
Modified: lucene/solr/trunk/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/example-DIH/solr/db/conf/solrconfig.xml?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/example/example-DIH/solr/db/conf/solrconfig.xml Tue Jan 12 02:19:56 2010
@@ -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>
Modified: lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/example/example-DIH/solr/mail/conf/solrconfig.xml Tue Jan 12 02:19:56 2010
@@ -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>
Modified: lucene/solr/trunk/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/example/example-DIH/solr/rss/conf/solrconfig.xml Tue Jan 12 02:19:56 2010
@@ -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>
Modified: lucene/solr/trunk/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/example/solr/conf/solrconfig.xml?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/example/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/example/solr/conf/solrconfig.xml Tue Jan 12 02:19:56 2010
@@ -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>
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/QuerySenderListener.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/QuerySenderListener.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/QuerySenderListener.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/QuerySenderListener.java Tue Jan 12 02:19:56 2010
@@ -23,7 +23,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/RequestHandlers.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/RequestHandlers.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/RequestHandlers.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/RequestHandlers.java Tue Jan 12 02:19:56 2010
@@ -21,8 +21,8 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrConfig.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrConfig.java Tue Jan 12 02:19:56 2010
@@ -25,7 +25,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java Tue Jan 12 02:19:56 2010
@@ -33,6 +33,16 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrResourceLoader.java Tue Jan 12 02:19:56 2010
@@ -47,8 +47,8 @@
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 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -27,7 +27,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java Tue Jan 12 02:19:56 2010
@@ -30,7 +30,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -26,7 +26,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -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 @@
@Override
public String getVersion() {
- return "$Revision:$";
+ return "$Revision$";
}
@Override
public String getSourceId() {
- return "$Id:$";
+ return "$Id$";
}
@Override
public String getSource() {
- return "$URL:$";
+ return "$URL$";
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java Tue Jan 12 02:19:56 2010
@@ -21,7 +21,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamLoader.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamLoader.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/ContentStreamLoader.java Tue Jan 12 02:19:56 2010
@@ -19,7 +19,7 @@
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;
/**
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -25,7 +25,7 @@
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
{
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java Tue Jan 12 02:19:56 2010
@@ -51,7 +51,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/PingRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/PingRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/PingRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/PingRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -24,8 +24,8 @@
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;
/**
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/ReplicationHandler.java Tue Jan 12 02:19:56 2010
@@ -26,9 +26,9 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerBase.java Tue Jan 12 02:19:56 2010
@@ -25,8 +25,8 @@
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 @@
*
* @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)
*
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/RequestHandlerUtils.java Tue Jan 12 02:19:56 2010
@@ -24,7 +24,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/SpellCheckerRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -26,7 +26,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/XMLLoader.java Tue Jan 12 02:19:56 2010
@@ -22,7 +22,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -25,7 +25,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/AdminHandlers.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/AdminHandlers.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/AdminHandlers.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/AdminHandlers.java Tue Jan 12 02:19:56 2010
@@ -24,8 +24,8 @@
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;
/**
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Tue Jan 12 02:19:56 2010
@@ -30,8 +30,8 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -57,7 +57,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java Tue Jan 12 02:19:56 2010
@@ -28,7 +28,7 @@
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"
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -22,7 +22,7 @@
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$
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -36,9 +36,9 @@
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
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Tue Jan 12 02:19:56 2010
@@ -37,7 +37,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java Tue Jan 12 02:19:56 2010
@@ -27,7 +27,7 @@
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"
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java Tue Jan 12 02:19:56 2010
@@ -34,7 +34,7 @@
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.*;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/ResponseBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/ResponseBuilder.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/ResponseBuilder.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/ResponseBuilder.java Tue Jan 12 02:19:56 2010
@@ -23,7 +23,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchComponent.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchComponent.java Tue Jan 12 02:19:56 2010
@@ -25,7 +25,7 @@
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;
/**
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchHandler.java Tue Jan 12 02:19:56 2010
@@ -26,7 +26,7 @@
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;
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/SolrRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/SolrRequestHandler.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/SolrRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/SolrRequestHandler.java Tue Jan 12 02:19:56 2010
@@ -19,6 +19,7 @@
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.
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java?rev=898152&r1=898151&r2=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/XMLWriter.java Tue Jan 12 02:19:56 2010
@@ -22,6 +22,7 @@
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 @@
- /**
- * 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 "name" 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();
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/BaseResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/BaseResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/BaseResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/BaseResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/BaseResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/BaseResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/BaseResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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;
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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.OutputStream;
import java.io.IOException;
+import org.apache.solr.request.SolrQueryRequest;
+
/**
* Implementations of <code>BinaryQueryResponseWriter</code> are used to
* write response in binary format
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/BinaryResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/BinaryResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/BinaryResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/BinaryResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/BinaryResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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.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;
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/GenericBinaryResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/GenericBinaryResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/GenericBinaryResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/GenericBinaryResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/GenericBinaryResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/GenericBinaryResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/GenericBinaryResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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 org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.request.SolrQueryRequest;
/**
*
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/GenericTextResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/GenericTextResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/GenericTextResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/GenericTextResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/GenericTextResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/GenericTextResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/GenericTextResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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;
/**
*
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/JSONResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/JSONResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/JSONResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/JSONResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/JSONResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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.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;
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/PHPResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/PHPResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/PHPResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/PHPResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/PHPResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/PHPResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/PHPResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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";
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/PHPSerializedResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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.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;
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/PythonResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/PythonResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/PythonResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/PythonResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/PythonResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/PythonResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/PythonResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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";
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/QueryResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/QueryResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/QueryResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/QueryResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/QueryResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/QueryResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/QueryResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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;
/**
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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 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.
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/RubyResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/RubyResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/RubyResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/RubyResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/RubyResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/RubyResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/RubyResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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";
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/SolrQueryResponse.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/SolrQueryResponse.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/SolrQueryResponse.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/SolrQueryResponse.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/SolrQueryResponse.java Tue Jan 12 02:19:56 2010
@@ -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;
Copied: lucene/solr/trunk/src/java/org/apache/solr/response/TextResponseWriter.java (from r898097, lucene/solr/trunk/src/java/org/apache/solr/request/TextResponseWriter.java)
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/response/TextResponseWriter.java?p2=lucene/solr/trunk/src/java/org/apache/solr/response/TextResponseWriter.java&p1=lucene/solr/trunk/src/java/org/apache/solr/request/TextResponseWriter.java&r1=898097&r2=898152&rev=898152&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/TextResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/response/TextResponseWriter.java Tue Jan 12 02:19:56 2010
@@ -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.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;