From 80fbf570644726dc8ac1acca24a2ab500616f516 Mon Sep 17 00:00:00 2001 From: Yonik Seeley Date: Fri, 3 Mar 2006 05:19:37 +0000 Subject: [PATCH] solar->solr, remove unused vars, switch to svn keywords git-svn-id: https://svn.apache.org/repos/asf/incubator/solr/trunk@382663 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/solr/request/SolrRequestHandler.java | 6 +++--- src/java/org/apache/solr/search/CacheConfig.java | 2 +- src/java/org/apache/solr/search/SolrIndexSearcher.java | 4 ++-- src/java/org/apache/solr/tst/OldRequestHandler.java | 6 +----- src/java/org/apache/solr/tst/TestRequestHandler.java | 6 +----- src/java/org/apache/solr/update/DirectUpdateHandler.java | 6 +----- src/webapp/resources/admin/registry.xsl | 5 ++--- src/webapp/resources/admin/stats.xsl | 5 ++--- src/webapp/resources/admin/tabular.xsl | 5 ++--- 9 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/java/org/apache/solr/request/SolrRequestHandler.java b/src/java/org/apache/solr/request/SolrRequestHandler.java index cc0cedacef7..9b487d6dfb3 100644 --- a/src/java/org/apache/solr/request/SolrRequestHandler.java +++ b/src/java/org/apache/solr/request/SolrRequestHandler.java @@ -23,9 +23,9 @@ import org.apache.solr.core.SolrInfoMBean; * Implementations of SolrRequestHandler are called to handle query requests. * * Different SolrRequestHandlers are registered with the SolrCore. - * One way to register a SolrRequestHandler with the core is thorugh the solarconfig.xml file. + * One way to register a SolrRequestHandler with the core is thorugh the solrconfig.xml file. *

- * Example solarconfig.xml entry to register a SolrRequestHandler implementation to + * Example solrconfig.xml entry to register a SolrRequestHandler implementation to * handle all queries with a query type of "test": *

* @@ -43,7 +43,7 @@ public interface SolrRequestHandler extends SolrInfoMBean { /** init will be called just once, immediately after creation. *

The args are user-level initialization parameters that * may be specified when declaring a request handler in - * solarconfig.xml + * solrconfig.xml */ public void init(NamedList args); diff --git a/src/java/org/apache/solr/search/CacheConfig.java b/src/java/org/apache/solr/search/CacheConfig.java index 9b19a996d44..617a0bf287b 100644 --- a/src/java/org/apache/solr/search/CacheConfig.java +++ b/src/java/org/apache/solr/search/CacheConfig.java @@ -30,7 +30,7 @@ import javax.xml.xpath.XPathConstants; /** * Contains the knowledge of how cache config is - * stored in the solarconfig.xml file, and implements a + * stored in the solrconfig.xml file, and implements a * factory to create caches. * * @author yonik diff --git a/src/java/org/apache/solr/search/SolrIndexSearcher.java b/src/java/org/apache/solr/search/SolrIndexSearcher.java index 9dd400fda29..810c6360d6d 100644 --- a/src/java/org/apache/solr/search/SolrIndexSearcher.java +++ b/src/java/org/apache/solr/search/SolrIndexSearcher.java @@ -252,7 +252,7 @@ public class SolrIndexSearcher extends Searcher implements SolrInfoMBean { public Hits search(Query query, Filter filter, Sort sort) throws IOException { - // todo - when SOLAR starts accepting filters, need to + // todo - when Solr starts accepting filters, need to // change this conditional check (filter!=null) and create a new filter // that ANDs them together if it already exists. @@ -577,7 +577,7 @@ public class SolrIndexSearcher extends Searcher implements SolrInfoMBean { static final int NO_CHECK_QCACHE=0x80; - + public static final int GET_SCORES=0x01; public static final int NO_CHECK_FILTERCACHE=0x02; diff --git a/src/java/org/apache/solr/tst/OldRequestHandler.java b/src/java/org/apache/solr/tst/OldRequestHandler.java index eaf16121693..b3dc3408856 100644 --- a/src/java/org/apache/solr/tst/OldRequestHandler.java +++ b/src/java/org/apache/solr/tst/OldRequestHandler.java @@ -126,12 +126,8 @@ public class OldRequestHandler implements SolrRequestHandler { return "$Id$"; } - public String getCvsName() { - return "$Name: $"; - } - public String getSource() { - return "$Source: /cvs/main/searching/solr/solarcore/src/solr/tst/OldRequestHandler.java,v $"; + return "$URL$"; } public URL[] getDocs() { diff --git a/src/java/org/apache/solr/tst/TestRequestHandler.java b/src/java/org/apache/solr/tst/TestRequestHandler.java index eac8b587b9a..9fd625df257 100644 --- a/src/java/org/apache/solr/tst/TestRequestHandler.java +++ b/src/java/org/apache/solr/tst/TestRequestHandler.java @@ -275,12 +275,8 @@ public class TestRequestHandler implements SolrRequestHandler { return "$Id$"; } - public String getCvsName() { - return "$Name: $"; - } - public String getSource() { - return "$Source: /cvs/main/searching/solr/solarcore/src/solr/tst/TestRequestHandler.java,v $"; + return "$URL$"; } public URL[] getDocs() { diff --git a/src/java/org/apache/solr/update/DirectUpdateHandler.java b/src/java/org/apache/solr/update/DirectUpdateHandler.java index b5b04a17539..27c657409af 100644 --- a/src/java/org/apache/solr/update/DirectUpdateHandler.java +++ b/src/java/org/apache/solr/update/DirectUpdateHandler.java @@ -358,12 +358,8 @@ public class DirectUpdateHandler extends UpdateHandler { return "$Id$"; } - public String getCvsName() { - return "$Name: $"; - } - public String getSource() { - return "$Source: /cvs/main/searching/solr/solarcore/src/solr/DirectUpdateHandler.java,v $"; + return "$URL$"; } public URL[] getDocs() { diff --git a/src/webapp/resources/admin/registry.xsl b/src/webapp/resources/admin/registry.xsl index ebc4ef16454..88e56b6e621 100644 --- a/src/webapp/resources/admin/registry.xsl +++ b/src/webapp/resources/admin/registry.xsl @@ -1,8 +1,7 @@ - - - + + - - - + + - - - + +