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 15:50:09 UTC
svn commit: r898346 - in /lucene/solr/trunk:
client/ruby/solr-ruby/solr/conf/ client/ruby/solr-ruby/test/conf/
contrib/clustering/src/test/resources/solr/conf/
contrib/velocity/src/main/solr/conf/ example/example-DIH/solr/db/conf/
example/example-DIH/s...
Author: ryan
Date: Tue Jan 12 14:50:08 2010
New Revision: 898346
URL: http://svn.apache.org/viewvc?rev=898346&view=rev
Log:
SOLR-1602 -- replacing FQN with solr.XXWriter in solrconfig.xml
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/resources/solr/conf/solrconfig.xml
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/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
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=898346&r1=898345&r2=898346&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 14:50:08 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.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="standard" class="solr.XMLResponseWriter"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.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.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.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=898346&r1=898345&r2=898346&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 14:50:08 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.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="standard" class="solr.XMLResponseWriter"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.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.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>
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=898346&r1=898345&r2=898346&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 14:50:08 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.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="xml" class="solr.XMLResponseWriter" default="true"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+ <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+ <queryResponseWriter name="phps" class="solr.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.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>
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=898346&r1=898345&r2=898346&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 14:50:08 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.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="xml" class="solr.XMLResponseWriter" default="true"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+ <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+ <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
- <queryResponseWriter name="velocity" class="org.apache.solr.response.VelocityResponseWriter"/>
+ <queryResponseWriter name="velocity" class="solr.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.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.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=898346&r1=898345&r2=898346&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 14:50:08 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.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="xml" class="solr.XMLResponseWriter" default="true"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+ <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+ <queryResponseWriter name="phps" class="solr.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.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.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=898346&r1=898345&r2=898346&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 14:50:08 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.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="xml" class="solr.XMLResponseWriter" default="true"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+ <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+ <queryResponseWriter name="phps" class="solr.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.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.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=898346&r1=898345&r2=898346&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 14:50:08 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.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="xml" class="solr.XMLResponseWriter" default="true"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+ <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+ <queryResponseWriter name="phps" class="solr.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.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.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=898346&r1=898345&r2=898346&view=diff
==============================================================================
--- lucene/solr/trunk/example/solr/conf/solrconfig.xml (original)
+++ lucene/solr/trunk/example/solr/conf/solrconfig.xml Tue Jan 12 14:50:08 2010
@@ -1001,12 +1001,12 @@
The following response writers are implicitly configured unless
overridden...
- <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="xml" class="solr.XMLResponseWriter" default="true"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+ <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+ <queryResponseWriter name="phps" class="solr.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.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>
Modified: lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig-spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig-spellchecker.xml?rev=898346&r1=898345&r2=898346&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig-spellchecker.xml (original)
+++ lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig-spellchecker.xml Tue Jan 12 14:50:08 2010
@@ -88,10 +88,10 @@
- <queryResponseWriter name="standard" class="org.apache.solr.response.XMLResponseWriter"/>
+ <queryResponseWriter name="standard" class="solr.XMLResponseWriter"/>
<queryResponseWriter name="useless" class="org.apache.solr.OutputWriterTest$UselessOutputWriter"/>
- <queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter"/>
- <queryResponseWriter name="json" class="org.apache.solr.response.JSONResponseWriter"/>
+ <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
<!-- config for the admin interface -->
Modified: lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig_perf.xml?rev=898346&r1=898345&r2=898346&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig_perf.xml (original)
+++ lucene/solr/trunk/src/test/test-files/solr/conf/solrconfig_perf.xml Tue Jan 12 14:50:08 2010
@@ -819,12 +819,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.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="xml" class="solr.XMLResponseWriter" default="true"/>
+ <queryResponseWriter name="json" class="solr.JSONResponseWriter"/>
+ <queryResponseWriter name="python" class="solr.PythonResponseWriter"/>
+ <queryResponseWriter name="ruby" class="solr.RubyResponseWriter"/>
+ <queryResponseWriter name="php" class="solr.PHPResponseWriter"/>
+ <queryResponseWriter name="phps" class="solr.PHPSerializedResponseWriter"/>
<queryResponseWriter name="custom" class="com.example.MyResponseWriter"/>
-->
@@ -833,7 +833,7 @@
in Solr's conf/xslt directory. Changes to xslt files are checked for
every xsltCacheLifetimeSeconds.
-->
- <queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter">
+ <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
<int name="xsltCacheLifetimeSeconds">5</int>
</queryResponseWriter>
Modified: lucene/solr/trunk/src/test/test-files/solr/crazy-path-to-config.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/test-files/solr/crazy-path-to-config.xml?rev=898346&r1=898345&r2=898346&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/test-files/solr/crazy-path-to-config.xml (original)
+++ lucene/solr/trunk/src/test/test-files/solr/crazy-path-to-config.xml Tue Jan 12 14:50:08 2010
@@ -65,9 +65,9 @@
<requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
- <queryResponseWriter name="standard" class="org.apache.solr.response.XMLResponseWriter"/>
+ <queryResponseWriter name="standard" class="solr.XMLResponseWriter"/>
<queryResponseWriter name="useless" class="org.apache.solr.OutputWriterTest$UselessOutputWriter"/>
- <queryResponseWriter name="xslt" class="org.apache.solr.response.XSLTResponseWriter"/>
+ <queryResponseWriter name="xslt" class="solr.XSLTResponseWriter"/>
<admin>