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 2008/09/18 04:16:28 UTC
svn commit: r696539 [2/2] - in /lucene/solr/trunk: ./ client/java/solrj/lib/
client/java/solrj/src/org/apache/solr/client/solrj/impl/
client/java/solrj/test/org/apache/solr/client/solrj/
client/java/solrj/test/org/apache/solr/client/solrj/embedded/ con...
Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java Wed Sep 17 19:16:26 2008
@@ -45,7 +45,8 @@
import java.io.Reader;
import java.io.IOException;
import java.util.*;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>IndexSchema</code> contains information about the valid fields in an index
@@ -56,7 +57,7 @@
public final class IndexSchema {
public static final String DEFAULT_SCHEMA_FILE = "schema.xml";
- final static Logger log = Logger.getLogger(IndexSchema.class.getName());
+ final static Logger log = LoggerFactory.getLogger(IndexSchema.class);
private final SolrConfig solrConfig;
private final String resourceName;
private String name;
@@ -386,7 +387,7 @@
Node nd = (Node) xpath.evaluate("/schema/@name", document, XPathConstants.NODE);
if (nd==null) {
- log.warning("schema has no name!");
+ log.warn("schema has no name!");
} else {
name = nd.getNodeValue();
log.info("Schema name=" + name);
@@ -429,7 +430,7 @@
@Override
protected FieldType register(String name, FieldType plugin) throws Exception {
- log.finest("fieldtype defined: " + plugin );
+ log.trace("fieldtype defined: " + plugin );
return fieldTypes.put( name, plugin );
}
};
@@ -453,7 +454,7 @@
NamedNodeMap attrs = node.getAttributes();
String name = DOMUtil.getAttr(attrs,"name","field definition");
- log.finest("reading field def "+name);
+ log.trace("reading field def "+name);
String type = DOMUtil.getAttr(attrs,"type","field " + name);
FieldType ft = fieldTypes.get(type);
@@ -479,13 +480,13 @@
SolrConfig.severeErrors.add( t );
}
- log.fine("field defined: " + f);
+ log.debug("field defined: " + f);
if( f.getDefaultValue() != null ) {
- log.fine(name+" contains default value: " + f.getDefaultValue());
+ log.debug(name+" contains default value: " + f.getDefaultValue());
fieldsWithDefaultValue.add( f );
}
if (f.isRequired()) {
- log.fine(name+" is required in this schema");
+ log.debug(name+" is required in this schema");
requiredFields.add(f);
}
} else if (node.getNodeName().equals("dynamicField")) {
@@ -505,7 +506,7 @@
}
if( !dup ) {
dFields.add(new DynamicField(f));
- log.fine("dynamic field defined: " + f);
+ log.debug("dynamic field defined: " + f);
}
} else {
// we should never get here
@@ -523,7 +524,7 @@
// the largest string possible.
Collections.sort(dFields);
- log.finest("Dynamic Field Ordering:" + dFields);
+ log.trace("Dynamic Field Ordering:" + dFields);
// stuff it in a normal array for faster access
dynamicFields = (DynamicField[])dFields.toArray(new DynamicField[dFields.size()]);
@@ -536,7 +537,7 @@
return Similarity.getDefault();
}
};
- log.fine("using default similarity");
+ log.debug("using default similarity");
} else {
final Object obj = solrConfig.getResourceLoader().newInstance(((Element) node).getAttribute("class"));
if (obj instanceof SimilarityFactory) {
@@ -552,12 +553,12 @@
}
};
}
- log.fine("using similarity factory" + similarityFactory.getClass().getName());
+ log.debug("using similarity factory" + similarityFactory.getClass().getName());
}
node = (Node) xpath.evaluate("/schema/defaultSearchField/text()", document, XPathConstants.NODE);
if (node==null) {
- log.warning("no default search field specified in schema.");
+ log.warn("no default search field specified in schema.");
} else {
defaultSearchFieldName=node.getNodeValue().trim();
// throw exception if specified, but not found or not indexed
@@ -573,7 +574,7 @@
node = (Node) xpath.evaluate("/schema/solrQueryParser/@defaultOperator", document, XPathConstants.NODE);
if (node==null) {
- log.fine("using default query parser operator (OR)");
+ log.debug("using default query parser operator (OR)");
} else {
queryParserDefaultOperator=node.getNodeValue().trim();
log.info("query parser default operator is "+queryParserDefaultOperator);
@@ -581,7 +582,7 @@
node = (Node) xpath.evaluate("/schema/uniqueKey/text()", document, XPathConstants.NODE);
if (node==null) {
- log.warning("no uniqueKey specified in schema.");
+ log.warn("no uniqueKey specified in schema.");
} else {
uniqueKeyField=getIndexedField(node.getNodeValue().trim());
uniqueKeyFieldName=uniqueKeyField.getName();
@@ -615,7 +616,7 @@
for (Map.Entry<SchemaField, Integer> entry : copyFieldTargetCounts.entrySet()) {
if (entry.getValue() > 1 && !entry.getKey().multiValued()) {
- log.warning("Field " + entry.getKey().name + " is not multivalued "+
+ log.warn("Field " + entry.getKey().name + " is not multivalued "+
"and destination for multiple copyFields ("+
entry.getValue()+")");
}
@@ -648,7 +649,7 @@
boolean sourceIsPattern = isWildCard(source);
boolean destIsPattern = isWildCard(dest);
- log.fine("copyField source='"+source+"' dest='"+dest+"'");
+ log.debug("copyField source='"+source+"' dest='"+dest+"'");
SchemaField d = getField(dest);
if(sourceIsPattern) {
@@ -700,7 +701,7 @@
temp[temp.length -1] = dcopy;
dynamicCopyFields = temp;
}
- log.finest("Dynamic Copy Field:" + dcopy );
+ log.trace("Dynamic Copy Field:" + dcopy );
}
private static Object[] append(Object[] orig, Object item) {
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java Wed Sep 17 19:16:26 2008
@@ -37,7 +37,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
import java.util.regex.Pattern;
/**
@@ -74,8 +73,8 @@
try {
Query query = schema.getSolrQueryParser(defaultField).parse(qs);
- if (SolrCore.log.isLoggable(Level.FINEST)) {
- SolrCore.log.finest("After QueryParser:" + query);
+ if (SolrCore.log.isTraceEnabled() ) {
+ SolrCore.log.trace("After QueryParser:" + query);
}
return query;
@@ -102,8 +101,8 @@
}
Query query = parser.parse(qs);
- if (SolrCore.log.isLoggable(Level.FINEST)) {
- SolrCore.log.finest("After QueryParser:" + query);
+ if (SolrCore.log.isTraceEnabled() ) {
+ SolrCore.log.trace("After QueryParser:" + query);
}
return query;
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/SolrCache.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/SolrCache.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/SolrCache.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/SolrCache.java Wed Sep 17 19:16:26 2008
@@ -20,7 +20,8 @@
import org.apache.solr.core.SolrInfoMBean;
import java.util.Map;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
@@ -30,7 +31,7 @@
* @version $Id$
*/
public interface SolrCache extends SolrInfoMBean {
- public final static Logger log = Logger.getLogger(SolrCache.class.getName());
+ public final static Logger log = LoggerFactory.getLogger(SolrCache.class);
/**
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java Wed Sep 17 19:16:26 2008
@@ -35,8 +35,8 @@
import java.io.IOException;
import java.net.URL;
import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -54,7 +54,7 @@
// NOTE: as of Lucene 1.9, this has changed!
public class SolrIndexSearcher extends Searcher implements SolrInfoMBean {
- private static Logger log = Logger.getLogger(SolrIndexSearcher.class.getName());
+ private static Logger log = LoggerFactory.getLogger(SolrIndexSearcher.class);
private final SolrCore core;
private final IndexSchema schema;
@@ -195,7 +195,7 @@
}
log.info(sb.toString());
} else {
- log.fine("Closing " + name);
+ log.debug("Closing " + name);
}
core.getInfoRegistry().remove(name);
try {
@@ -888,7 +888,7 @@
searcher.search(query, hc );
}
catch( TimeLimitedCollector.TimeExceededException x ) {
- log.warning( "Query: " + query + "; " + x.getMessage() );
+ log.warn( "Query: " + query + "; " + x.getMessage() );
qr.setPartialResults(true);
}
@@ -920,7 +920,7 @@
searcher.search(query, hc );
}
catch( TimeLimitedCollector.TimeExceededException x ) {
- log.warning( "Query: " + query + "; " + x.getMessage() );
+ log.warn( "Query: " + query + "; " + x.getMessage() );
qr.setPartialResults(true);
}
@@ -966,7 +966,7 @@
searcher.search(query, hc );
}
catch( TimeLimitedCollector.TimeExceededException x ) {
- log.warning( "Query: " + query + "; " + x.getMessage() );
+ log.warn( "Query: " + query + "; " + x.getMessage() );
qr.setPartialResults(true);
}
@@ -1089,7 +1089,7 @@
);
}
catch( TimeLimitedCollector.TimeExceededException x ) {
- log.warning( "Query: " + query + "; " + x.getMessage() );
+ log.warn( "Query: " + query + "; " + x.getMessage() );
qr.setPartialResults(true);
}
@@ -1119,7 +1119,7 @@
);
}
catch( TimeLimitedCollector.TimeExceededException x ) {
- log.warning( "Query: " + query + "; " + x.getMessage() );
+ log.warn( "Query: " + query + "; " + x.getMessage() );
qr.setPartialResults(true);
}
@@ -1161,7 +1161,7 @@
);
}
catch( TimeLimitedCollector.TimeExceededException x ) {
- log.warning( "Query: " + query + "; " + x.getMessage() );
+ log.warn( "Query: " + query + "; " + x.getMessage() );
qr.setPartialResults(true);
}
@@ -1510,7 +1510,7 @@
*/
public void warm(SolrIndexSearcher old) throws IOException {
// Make sure this is first! filters can help queryResults execute!
- boolean logme = log.isLoggable(Level.INFO);
+ boolean logme = log.isInfoEnabled();
long warmingStartTime = System.currentTimeMillis();
// warm the caches in order...
for (int i=0; i<cacheList.length; i++) {
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/function/FileFloatSource.java Wed Sep 17 19:16:26 2008
@@ -188,7 +188,7 @@
is = VersionedFile.getLatestFile(ffs.dataDir, fname);
} catch (IOException e) {
// log, use defaults
- SolrCore.log.severe("Error opening external value source file: " +e);
+ SolrCore.log.error("Error opening external value source file: " +e);
return vals;
}
@@ -251,7 +251,7 @@
fval=Float.parseFloat(val);
} catch (Exception e) {
if (++otherErrors<=10) {
- SolrCore.log.severe( "Error loading external value source + fileName + " + e
+ SolrCore.log.error( "Error loading external value source + fileName + " + e
+ (otherErrors<10 ? "" : "\tSkipping future errors for this file.")
);
}
@@ -325,7 +325,7 @@
}
} catch (IOException e) {
// log, use defaults
- SolrCore.log.severe("Error loading external value source: " +e);
+ SolrCore.log.error("Error loading external value source: " +e);
} finally {
// swallow exceptions on close so we don't override any
// exceptions that happened in the loop
Modified: lucene/solr/trunk/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java Wed Sep 17 19:16:26 2008
@@ -23,7 +23,8 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
@@ -52,7 +53,7 @@
* @since solr 1.3
*/
public abstract class AbstractLuceneSpellChecker extends SolrSpellChecker {
- public static final Logger LOG = Logger.getLogger(AbstractLuceneSpellChecker.class.getName());
+ public static final Logger log = LoggerFactory.getLogger(AbstractLuceneSpellChecker.class);
public static final String SPELLCHECKER_ARG_NAME = "spellchecker";
public static final String LOCATION = "sourceLocation";
@@ -120,7 +121,7 @@
analyzer = fieldType.getQueryAnalyzer();
}
if (analyzer == null) {
- LOG.info("Using WhitespaceAnalzyer for dictionary: " + name);
+ log.info("Using WhitespaceAnalzyer for dictionary: " + name);
analyzer = new WhitespaceAnalyzer();
}
return name;
Modified: lucene/solr/trunk/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java Wed Sep 17 19:16:26 2008
@@ -19,8 +19,8 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
@@ -47,7 +47,7 @@
**/
public class FileBasedSpellChecker extends AbstractLuceneSpellChecker {
- private static final Logger log = Logger.getLogger(FileBasedSpellChecker.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(FileBasedSpellChecker.class);
public static final String SOURCE_FILE_CHAR_ENCODING = "characterEncoding";
@@ -118,7 +118,7 @@
} catch (IOException e) {
- log.log(Level.SEVERE, "Unable to load spellings", e);
+ log.error( "Unable to load spellings", e);
} finally {
try {
if (searcher != null)
Modified: lucene/solr/trunk/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java Wed Sep 17 19:16:26 2008
@@ -28,7 +28,8 @@
import org.apache.solr.util.HighFrequencyDictionary;
import java.io.IOException;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -44,7 +45,7 @@
* @since solr 1.3
**/
public class IndexBasedSpellChecker extends AbstractLuceneSpellChecker {
- private static final Logger log = Logger.getLogger(IndexBasedSpellChecker.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(IndexBasedSpellChecker.class);
public static final String THRESHOLD_TOKEN_FREQUENCY = "thresholdTokenFrequency";
Modified: lucene/solr/trunk/src/java/org/apache/solr/tst/OldRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/tst/OldRequestHandler.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/tst/OldRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/tst/OldRequestHandler.java Wed Sep 17 19:16:26 2008
@@ -21,7 +21,6 @@
import org.apache.lucene.document.Document;
import java.util.List;
-import java.util.logging.Level;
import java.io.IOException;
import java.net.URL;
@@ -45,7 +44,7 @@
long numErrors;
public void init(NamedList args) {
- SolrCore.log.log(Level.INFO, "Unused request handler arguments:" + args);
+ SolrCore.log.info( "Unused request handler arguments:" + args);
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/tst/TestRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/tst/TestRequestHandler.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/tst/TestRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/tst/TestRequestHandler.java Wed Sep 17 19:16:26 2008
@@ -24,8 +24,8 @@
import java.util.*;
import java.util.regex.Pattern;
-import java.util.logging.Logger;
-import java.util.logging.Level;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.net.URL;
import org.apache.solr.util.OpenBitSet;
@@ -45,10 +45,10 @@
*/
@Deprecated
public class TestRequestHandler implements SolrRequestHandler {
- private static Logger log = Logger.getLogger(SolrIndexSearcher.class.getName());
+ private static Logger log = LoggerFactory.getLogger(SolrIndexSearcher.class);
public void init(NamedList args) {
- SolrCore.log.log(Level.INFO, "Unused request handler arguments:" + args);
+ SolrCore.log.info( "Unused request handler arguments:" + args);
}
// use test instead of assert since asserts may be turned off
Modified: lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler.java Wed Sep 17 19:16:26 2008
@@ -30,7 +30,6 @@
import java.util.HashSet;
import java.util.concurrent.Future;
import java.util.concurrent.ExecutionException;
-import java.util.logging.Level;
import java.io.IOException;
import java.net.URL;
@@ -136,8 +135,8 @@
try {
Term term = new Term(idField.getName(), indexedId);
num = ir.deleteDocuments(term);
- if (core.log.isLoggable(Level.FINEST)) {
- core.log.finest( core.getLogId()+"deleted " + num + " docs matching id " + idFieldType.indexedToReadable(indexedId));
+ if (core.log.isTraceEnabled()) {
+ core.log.trace( core.getLogId()+"deleted " + num + " docs matching id " + idFieldType.indexedToReadable(indexedId));
}
} finally {
try { if (tdocs != null) tdocs.close(); } catch (Exception e) {}
@@ -204,8 +203,8 @@
totDeleted = deleter.deleted;
}
- if (core.log.isLoggable(Level.FINE)) {
- core.log.fine(core.getLogId()+"docs deleted:" + totDeleted);
+ if (core.log.isDebugEnabled()) {
+ core.log.debug(core.getLogId()+"docs deleted:" + totDeleted);
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java Wed Sep 17 19:16:26 2008
@@ -34,7 +34,6 @@
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
import java.io.IOException;
import java.net.URL;
@@ -516,7 +515,7 @@
autoCommitCount++;
}
catch (Exception e) {
- log.severe( "auto commit error..." );
+ log.error( "auto commit error..." );
e.printStackTrace();
}
finally {
Modified: lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java Wed Sep 17 19:16:26 2008
@@ -25,7 +25,8 @@
import org.apache.solr.common.SolrException;
import org.apache.solr.schema.IndexSchema;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
/**
@@ -37,13 +38,13 @@
public class SolrIndexWriter extends IndexWriter {
- private static Logger log = Logger.getLogger(SolrIndexWriter.class.getName());
+ private static Logger log = LoggerFactory.getLogger(SolrIndexWriter.class);
String name;
IndexSchema schema;
private void init(String name, IndexSchema schema, SolrIndexConfig config) throws IOException {
- log.fine("Opened Writer " + name);
+ log.debug("Opened Writer " + name);
this.name = name;
this.schema = schema;
setSimilarity(schema.getSimilarity());
@@ -83,7 +84,7 @@
String rawLockType = (null == config) ? null : config.lockType;
if (null == rawLockType) {
// we default to "simple" for backwards compatiblitiy
- log.warning("No lockType configured for " + path + " assuming 'simple'");
+ log.warn("No lockType configured for " + path + " assuming 'simple'");
rawLockType = "simple";
}
final String lockType = rawLockType.toLowerCase().trim();
@@ -98,7 +99,7 @@
d.setLockFactory(new SingleInstanceLockFactory());
} else if ("none".equals(lockType)) {
// recipie for disaster
- log.severe("CONFIGURATION WARNING: locks are disabled on " + path);
+ log.error("CONFIGURATION WARNING: locks are disabled on " + path);
d.setLockFactory(new NoLockFactory());
} else {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
@@ -149,7 +150,7 @@
*/
public void close() throws IOException {
- log.fine("Closing Writer " + name);
+ log.debug("Closing Writer " + name);
super.close();
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java Wed Sep 17 19:16:26 2008
@@ -26,7 +26,8 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Vector;
import java.io.IOException;
@@ -50,7 +51,7 @@
*/
public abstract class UpdateHandler implements SolrInfoMBean {
- protected final static Logger log = Logger.getLogger(UpdateHandler.class.getName());
+ protected final static Logger log = LoggerFactory.getLogger(UpdateHandler.class);
protected final SolrCore core;
protected final IndexSchema schema;
Modified: lucene/solr/trunk/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java Wed Sep 17 19:16:26 2008
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
@@ -53,8 +52,8 @@
@Override
public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
- boolean doLog = LogUpdateProcessor.log.isLoggable(Level.INFO);
- // LogUpdateProcessor.log.severe("Will Log=" + doLog);
+ boolean doLog = LogUpdateProcessor.log.isInfoEnabled();
+ // LogUpdateProcessor.log.error("Will Log=" + doLog);
if( doLog ) {
// only create the log processor if we will use it
return new LogUpdateProcessor(req, rsp, this, next);
Modified: lucene/solr/trunk/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java Wed Sep 17 19:16:26 2008
@@ -18,7 +18,8 @@
package org.apache.solr.update.processor;
import java.io.IOException;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.CommitUpdateCommand;
@@ -38,7 +39,7 @@
* @since solr 1.3
*/
public abstract class UpdateRequestProcessor {
- protected static Logger log = Logger.getLogger(UpdateRequestProcessor.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(UpdateRequestProcessor.class);
protected final UpdateRequestProcessor next;
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/CommonParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/CommonParams.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/CommonParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/CommonParams.java Wed Sep 17 19:16:26 2008
@@ -19,7 +19,8 @@
import org.apache.solr.common.util.NamedList;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A collection on common params, both for Plugin initialization and
@@ -29,7 +30,7 @@
@Deprecated
public class CommonParams implements org.apache.solr.common.params.CommonParams {
- public static Logger log = Logger.getLogger(CommonParams.class.getName());
+ public static Logger log = LoggerFactory.getLogger(CommonParams.class);
/** the default field list to be used */
@@ -84,7 +85,7 @@
if (tmp instanceof String) {
fl = tmp.toString();
} else {
- log.severe("init param is not a str: " + FL);
+ log.error("init param is not a str: " + FL);
}
}
@@ -93,7 +94,7 @@
if (tmp instanceof String) {
df = tmp.toString();
} else {
- log.severe("init param is not a str: " + DF);
+ log.error("init param is not a str: " + DF);
}
}
@@ -102,7 +103,7 @@
if (tmp instanceof String) {
debugQuery = tmp.toString();
} else {
- log.severe("init param is not a str: " + DEBUG_QUERY);
+ log.error("init param is not a str: " + DEBUG_QUERY);
}
}
@@ -111,7 +112,7 @@
if (tmp instanceof String) {
explainOther = tmp.toString();
} else {
- log.severe("init param is not a str: " + EXPLAIN_OTHER);
+ log.error("init param is not a str: " + EXPLAIN_OTHER);
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/DisMaxParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/DisMaxParams.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/DisMaxParams.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/DisMaxParams.java Wed Sep 17 19:16:26 2008
@@ -17,7 +17,8 @@
package org.apache.solr.util;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.solr.common.util.NamedList;
@@ -28,7 +29,7 @@
@Deprecated
public class DisMaxParams extends CommonParams implements org.apache.solr.common.params.DisMaxParams {
- public static Logger log = Logger.getLogger(DisMaxParams.class.getName());
+ public static Logger log = LoggerFactory.getLogger(DisMaxParams.class);
/** query and init param for filtering query
@@ -104,7 +105,7 @@
if (tmp instanceof Float) {
tiebreaker = ((Float)tmp).floatValue();
} else {
- log.severe("init param is not a float: " + TIE);
+ log.error("init param is not a float: " + TIE);
}
}
@@ -113,7 +114,7 @@
if (tmp instanceof String) {
qf = tmp.toString();
} else {
- log.severe("init param is not a str: " + QF);
+ log.error("init param is not a str: " + QF);
}
}
@@ -122,7 +123,7 @@
if (tmp instanceof String) {
pf = tmp.toString();
} else {
- log.severe("init param is not a str: " + PF);
+ log.error("init param is not a str: " + PF);
}
}
@@ -132,7 +133,7 @@
if (tmp instanceof String) {
mm = tmp.toString();
} else {
- log.severe("init param is not a str: " + MM);
+ log.error("init param is not a str: " + MM);
}
}
@@ -141,7 +142,7 @@
if (tmp instanceof Integer) {
pslop = ((Integer)tmp).intValue();
} else {
- log.severe("init param is not an int: " + PS);
+ log.error("init param is not an int: " + PS);
}
}
@@ -150,7 +151,7 @@
if (tmp instanceof String) {
bq = tmp.toString();
} else {
- log.severe("init param is not a str: " + BQ);
+ log.error("init param is not a str: " + BQ);
}
}
@@ -159,7 +160,7 @@
if (tmp instanceof String) {
bf = tmp.toString();
} else {
- log.severe("init param is not a str: " + BF);
+ log.error("init param is not a str: " + BF);
}
}
@@ -168,7 +169,7 @@
if (tmp instanceof String) {
fq = tmp.toString();
} else {
- log.severe("init param is not a str: " + FQ);
+ log.error("init param is not a str: " + FQ);
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java Wed Sep 17 19:16:26 2008
@@ -39,9 +39,7 @@
import java.io.IOException;
import java.util.*;
-import java.util.logging.Level;
import java.util.regex.Pattern;
-import java.util.regex.Matcher;
/**
* <p>Utilities that may be of use to RequestHandlers.</p>
@@ -821,7 +819,7 @@
/* we definitely had some sort of sort string from the user,
* but no SortSpec came out of it
*/
- SolrCore.log.log(Level.WARNING,"Invalid sort \""+sort+"\" was specified, ignoring", sortE);
+ SolrCore.log.warn("Invalid sort \""+sort+"\" was specified, ignoring", sortE);
return null;
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java Wed Sep 17 19:16:26 2008
@@ -19,7 +19,8 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
@@ -37,7 +38,7 @@
*/
public abstract class AbstractPluginLoader<T>
{
- public static Logger log = Logger.getLogger(AbstractPluginLoader.class.getName());
+ public static Logger log = LoggerFactory.getLogger(AbstractPluginLoader.class);
private final String type;
private final boolean preRegister;
Modified: lucene/solr/trunk/src/java/org/apache/solr/util/xslt/TransformerProvider.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/util/xslt/TransformerProvider.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/util/xslt/TransformerProvider.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/util/xslt/TransformerProvider.java Wed Sep 17 19:16:26 2008
@@ -19,8 +19,8 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
@@ -51,11 +51,11 @@
/** singleton */
private TransformerProvider() {
- log = Logger.getLogger(TransformerProvider.class.getName());
+ log = LoggerFactory.getLogger(TransformerProvider.class.getName());
// tell'em: currently, we only cache the last used XSLT transform, and blindly recompile it
// once cacheLifetimeSeconds expires
- log.warning(
+ log.warn(
"The TransformerProvider's simplistic XSLT caching mechanism is not appropriate "
+ "for high load scenarios, unless a single XSLT transform is used"
+ " and xsltCacheLifetimeSeconds is set to a sufficiently high value."
@@ -69,8 +69,8 @@
// For now, the Templates are blindly reloaded once cacheExpires is over.
// It'd be better to check the file modification time to reload only if needed.
if(lastTemplates!=null && filename.equals(lastFilename) && System.currentTimeMillis() < cacheExpires) {
- if(log.isLoggable(Level.FINE)) {
- log.fine("Using cached Templates:" + filename);
+ if(log.isDebugEnabled()) {
+ log.debug("Using cached Templates:" + filename);
}
} else {
lastTemplates = getTemplates(solrConfig.getResourceLoader(), filename,cacheLifetimeSeconds);
@@ -81,7 +81,7 @@
try {
result = lastTemplates.newTransformer();
} catch(TransformerConfigurationException tce) {
- log.throwing(getClass().getName(), "getTransformer", tce);
+ log.error(getClass().getName(), "getTransformer", tce);
final IOException ioe = new IOException("newTransformer fails ( " + lastFilename + ")");
ioe.initCause(tce);
throw ioe;
@@ -96,13 +96,13 @@
Templates result = null;
lastFilename = null;
try {
- if(log.isLoggable(Level.FINE)) {
- log.fine("compiling XSLT templates:" + filename);
+ if(log.isDebugEnabled()) {
+ log.debug("compiling XSLT templates:" + filename);
}
final InputStream xsltStream = loader.openResource("xslt/" + filename);
result = tFactory.newTemplates(new StreamSource(xsltStream));
} catch (Exception e) {
- log.throwing(getClass().getName(), "newTemplates", e);
+ log.error(getClass().getName(), "newTemplates", e);
final IOException ioe = new IOException("Unable to initialize Templates '" + filename + "'");
ioe.initCause(e);
throw ioe;
Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java Wed Sep 17 19:16:26 2008
@@ -21,8 +21,8 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.WeakHashMap;
-import java.util.logging.Logger;
-import java.util.logging.Level;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -47,7 +47,7 @@
*/
public class SolrDispatchFilter implements Filter
{
- final Logger log = Logger.getLogger(SolrDispatchFilter.class.getName());
+ final Logger log = LoggerFactory.getLogger(SolrDispatchFilter.class);
protected CoreContainer cores;
protected String pathPrefix = null; // strip this from the beginning of a path
@@ -72,7 +72,7 @@
}
catch( Throwable t ) {
// catch this so our filter still works
- log.log(Level.SEVERE, "Could not start SOLR. Check solr/home property", t);
+ log.error( "Could not start SOLR. Check solr/home property", t);
SolrConfig.severeErrors.add( t );
SolrCore.log( t );
}
@@ -275,7 +275,7 @@
}
}
}
- log.fine("no handler or core retrieved for " + path + ", follow through...");
+ log.debug("no handler or core retrieved for " + path + ", follow through...");
}
catch (Throwable ex) {
sendError( (HttpServletResponse)response, ex );
@@ -320,7 +320,7 @@
// non standard codes have undefined results with various servers
if( code < 100 ) {
- log.warning( "invalid return code: "+code );
+ log.warn( "invalid return code: "+code );
code = 500;
}
}
Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java Wed Sep 17 19:16:26 2008
@@ -29,7 +29,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServletRequest;
@@ -51,7 +52,7 @@
public class SolrRequestParsers
{
- final Logger log = Logger.getLogger(SolrRequestParsers.class.getName());
+ final Logger log = LoggerFactory.getLogger(SolrRequestParsers.class);
// Should these constants be in a more public place?
public static final String MULTIPART = "multipart";
Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrServlet.java Wed Sep 17 19:16:26 2008
@@ -20,7 +20,8 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -44,7 +45,7 @@
@Deprecated
public class SolrServlet extends HttpServlet {
- final Logger log = Logger.getLogger(SolrServlet.class.getName());
+ final Logger log = LoggerFactory.getLogger(SolrServlet.class);
private boolean hasMulticore = false;
public void init() throws ServletException {
@@ -78,7 +79,7 @@
SolrRequestHandler handler = core.getRequestHandler(solrReq.getQueryType());
if (handler==null) {
- log.warning("Unknown Request Handler '" + solrReq.getQueryType() +"' :" + solrReq);
+ log.warn("Unknown Request Handler '" + solrReq.getQueryType() +"' :" + solrReq);
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,"Unknown Request Handler '" + solrReq.getQueryType() + "'", true);
}
core.execute(handler, solrReq, solrRsp );
Modified: lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java (original)
+++ lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java Wed Sep 17 19:16:26 2008
@@ -19,7 +19,8 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -38,7 +39,7 @@
*/
@Deprecated
public class SolrUpdateServlet extends HttpServlet {
- final Logger log = Logger.getLogger(SolrUpdateServlet.class.getName());
+ final Logger log = LoggerFactory.getLogger(SolrUpdateServlet.class);
XmlUpdateRequestHandler legacyUpdateHandler;
XMLResponseWriter xmlResponseWriter;
@@ -69,7 +70,7 @@
response.setContentType(QueryResponseWriter.CONTENT_TYPE_XML_UTF8);
if( request.getQueryString() != null ) {
- log.warning(
+ log.warn(
"The @Deprecated SolrUpdateServlet does not accept query parameters: "+request.getQueryString()+"\n"
+" If you are using solrj, make sure to register a request handler to /update rather then use this servlet.\n"
+" Add: <requestHandler name=\"/update\" class=\"solr.XmlUpdateRequestHandler\" > to your solrconfig.xml\n\n" );