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 [1/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...
Author: ryan
Date: Wed Sep 17 19:16:26 2008
New Revision: 696539
URL: http://svn.apache.org/viewvc?rev=696539&view=rev
Log:
SOLR-560: Use SLF4J logging API rather then JDK logging. The packaged .war file is
shipped with a JDK logging implementation, so logging configuration for the .war should
be identical to solr 1.3. However, if you are using the .jar file, you can select
which logging implementation to use by dropping a different binding.
See: http://www.slf4j.org/
Added:
lucene/solr/trunk/client/java/solrj/lib/slf4j-api-1.5.3.jar (with props)
lucene/solr/trunk/client/java/solrj/lib/slf4j-jdk14-1.5.3.jar (with props)
lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/StartSolrJetty.java
lucene/solr/trunk/lib/slf4j-api-1.5.3.jar (with props)
lucene/solr/trunk/lib/slf4j-jdk14-1.5.3.jar (with props)
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/NOTICE.txt
lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/impl/XMLResponseParser.java
lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImportHandler.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java
lucene/solr/trunk/src/java/org/apache/solr/common/util/StrUtils.java
lucene/solr/trunk/src/java/org/apache/solr/core/Config.java
lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
lucene/solr/trunk/src/java/org/apache/solr/core/JmxMonitoredMap.java
lucene/solr/trunk/src/java/org/apache/solr/core/RequestHandlers.java
lucene/solr/trunk/src/java/org/apache/solr/core/RunExecutableListener.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/SolrEventListener.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/SpellCheckerRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/solr/trunk/src/java/org/apache/solr/handler/component/SearchHandler.java
lucene/solr/trunk/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java
lucene/solr/trunk/src/java/org/apache/solr/request/XSLTResponseWriter.java
lucene/solr/trunk/src/java/org/apache/solr/schema/FieldType.java
lucene/solr/trunk/src/java/org/apache/solr/schema/IndexSchema.java
lucene/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java
lucene/solr/trunk/src/java/org/apache/solr/search/SolrCache.java
lucene/solr/trunk/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/solr/trunk/src/java/org/apache/solr/search/function/FileFloatSource.java
lucene/solr/trunk/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
lucene/solr/trunk/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
lucene/solr/trunk/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.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/DirectUpdateHandler.java
lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java
lucene/solr/trunk/src/java/org/apache/solr/update/UpdateHandler.java
lucene/solr/trunk/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
lucene/solr/trunk/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java
lucene/solr/trunk/src/java/org/apache/solr/util/CommonParams.java
lucene/solr/trunk/src/java/org/apache/solr/util/DisMaxParams.java
lucene/solr/trunk/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/solr/trunk/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
lucene/solr/trunk/src/java/org/apache/solr/util/xslt/TransformerProvider.java
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/solr/trunk/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.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
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Wed Sep 17 19:16:26 2008
@@ -30,7 +30,12 @@
----------------------
New Features
-----------------------
+ 1. SOLR-560: Use SLF4J logging API rather then JDK logging. The packaged .war file is
+ shipped with a JDK logging implementation, so logging configuration for the .war should
+ be identical to solr 1.3. However, if you are using the .jar file, you can select
+ which logging implementation to use by dropping a different binding.
+ See: http://www.slf4j.org/ (ryan)
+
Optimizations
----------------------
Modified: lucene/solr/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/NOTICE.txt?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/NOTICE.txt (original)
+++ lucene/solr/trunk/NOTICE.txt Wed Sep 17 19:16:26 2008
@@ -87,4 +87,29 @@
1999 Jason Gilbert.
The jboss integration module contains some LGPL code.
----
+
+=========================================================================
+== SLF4J Notice -- http://www.slf4j.org/license.html ==
+=========================================================================
+
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Added: lucene/solr/trunk/client/java/solrj/lib/slf4j-api-1.5.3.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/lib/slf4j-api-1.5.3.jar?rev=696539&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/trunk/client/java/solrj/lib/slf4j-api-1.5.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/trunk/client/java/solrj/lib/slf4j-jdk14-1.5.3.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/lib/slf4j-jdk14-1.5.3.jar?rev=696539&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/trunk/client/java/solrj/lib/slf4j-jdk14-1.5.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/impl/XMLResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/impl/XMLResponseParser.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/impl/XMLResponseParser.java (original)
+++ lucene/solr/trunk/client/java/solrj/src/org/apache/solr/client/solrj/impl/XMLResponseParser.java Wed Sep 17 19:16:26 2008
@@ -22,7 +22,8 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
@@ -44,7 +45,7 @@
*/
public class XMLResponseParser extends ResponseParser
{
- public static Logger log = Logger.getLogger(XMLResponseParser.class.getName());
+ public static Logger log = LoggerFactory.getLogger(XMLResponseParser.class);
// reuse the factory among all parser instances so things like string caches
// won't be duplicated
@@ -63,7 +64,7 @@
catch( IllegalArgumentException ex ) {
// Other implementations will likely throw this exception since "reuse-instance"
// isimplementation specific.
- log.fine( "Unable to set the 'reuse-instance' property for the input factory: "+factory );
+ log.debug( "Unable to set the 'reuse-instance' property for the input factory: "+factory );
}
}
Added: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/StartSolrJetty.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/StartSolrJetty.java?rev=696539&view=auto
==============================================================================
--- lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/StartSolrJetty.java (added)
+++ lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/StartSolrJetty.java Wed Sep 17 19:16:26 2008
@@ -0,0 +1,71 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.client.solrj;
+
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.webapp.WebAppContext;
+
+/**
+ * @since solr 1.3
+ */
+public class StartSolrJetty
+{
+ public static void main( String[] args )
+ {
+ //System.setProperty("solr.solr.home", "../../../example/solr");
+
+ Server server = new Server();
+ SocketConnector connector = new SocketConnector();
+ // Set some timeout options to make debugging easier.
+ connector.setMaxIdleTime(1000 * 60 * 60);
+ connector.setSoLingerTime(-1);
+ connector.setPort(8080);
+ server.setConnectors(new Connector[] { connector });
+
+ WebAppContext bb = new WebAppContext();
+ bb.setServer(server);
+ bb.setContextPath("/");
+ bb.setWar("src/webapp/web");
+
+// // START JMX SERVER
+// if( true ) {
+// MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
+// MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer);
+// server.getContainer().addEventListener(mBeanContainer);
+// mBeanContainer.start();
+// }
+
+ server.addHandler(bb);
+
+ try {
+ System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP");
+ server.start();
+ while (System.in.available() == 0) {
+ Thread.sleep(5000);
+ }
+ server.stop();
+ server.join();
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ System.exit(100);
+ }
+ }
+}
Modified: lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (original)
+++ lucene/solr/trunk/client/java/solrj/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java Wed Sep 17 19:16:26 2008
@@ -35,14 +35,15 @@
import org.junit.Test;
import java.io.File;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Id$
* @since solr 1.3
*/
public class TestSolrProperties {
- protected static Logger log = Logger.getLogger(TestSolrProperties.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(TestSolrProperties.class);
protected CoreContainer cores = null;
public String getSolrHome() {
@@ -73,7 +74,7 @@
log.info("NOTE: per solr.test.leavedatadir, dataDir will not be removed: " + dataDir.getAbsolutePath());
} else {
if (!AbstractSolrTestCase.recurseDelete(dataDir)) {
- log.warning("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
+ log.warn("!!!! WARNING: best effort to remove " + dataDir.getAbsolutePath() + " FAILED !!!!!");
}
}
File persistedFile = new File(getSolrHome() + File.separator + "solr-persist.xml");
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -38,8 +38,8 @@
import org.apache.solr.util.plugin.SolrCoreAware;
import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -63,8 +63,7 @@
public class DataImportHandler extends RequestHandlerBase implements
SolrCoreAware {
- private static final Logger LOG = Logger.getLogger(DataImportHandler.class
- .getName());
+ private static final Logger LOG = LoggerFactory.getLogger(DataImportHandler.class);
private DataImporter importer;
@@ -110,7 +109,7 @@
}
} catch (Throwable e) {
SolrConfig.severeErrors.add(e);
- LOG.log(Level.SEVERE, DataImporter.MSG.LOAD_EXP, e);
+ LOG.error( DataImporter.MSG.LOAD_EXP, e);
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
DataImporter.MSG.INVALID_CONFIG, e);
}
@@ -287,7 +286,7 @@
return super.upload(document);
} catch (RuntimeException e) {
- LOG.log(Level.SEVERE, "Exception while adding: " + d, e);
+ LOG.error( "Exception while adding: " + d, e);
return false;
}
}
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DataImporter.java Wed Sep 17 19:16:26 2008
@@ -32,8 +32,8 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -51,8 +51,7 @@
IDLE, RUNNING_FULL_DUMP, RUNNING_DELTA_DUMP, JOB_FAILED
}
- private static final Logger LOG = Logger.getLogger(DataImporter.class
- .getName());
+ private static final Logger LOG = LoggerFactory.getLogger(DataImporter.class);
private Status status = Status.IDLE;
@@ -335,7 +334,7 @@
if (!requestParams.debug)
cumulativeStatistics.add(docBuilder.importStatistics);
} catch (RuntimeException e) {
- LOG.log(Level.SEVERE, "Full Import failed", e);
+ LOG.error( "Full Import failed", e);
} finally {
setStatus(Status.IDLE);
config.clearCaches();
@@ -360,7 +359,7 @@
if (!requestParams.debug)
cumulativeStatistics.add(docBuilder.importStatistics);
} catch (RuntimeException e) {
- LOG.log(Level.SEVERE, "Delta Import Failed", e);
+ LOG.error( "Delta Import Failed", e);
} finally {
setStatus(Status.IDLE);
config.clearCaches();
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java Wed Sep 17 19:16:26 2008
@@ -23,8 +23,8 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -43,8 +43,8 @@
* @since solr 1.3
*/
public class DateFormatTransformer extends Transformer {
- private static final Logger LOG = Logger
- .getLogger(DateFormatTransformer.class.getName());
+ private static final Logger LOG = LoggerFactory
+ .getLogger(DateFormatTransformer.class);
@SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> aRow, Context context) {
@@ -70,7 +70,7 @@
aRow.put(column, process(value, fmt));
}
} catch (ParseException e) {
- LOG.log(Level.WARNING, "Could not parse a Date field ", e);
+ LOG.warn( "Could not parse a Date field ", e);
}
}
return aRow;
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Wed Sep 17 19:16:26 2008
@@ -23,8 +23,8 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -41,8 +41,7 @@
public class DocBuilder {
public static final String DOC_BOOST = "$docBoost";
- private static final Logger LOG = Logger
- .getLogger(DocBuilder.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(DocBuilder.class);
private DataImporter dataImporter;
@@ -330,7 +329,7 @@
if (e.getErrCode() == DataImportHandlerException.SKIP) {
importStatistics.skipDocCount.getAndIncrement();
} else {
- LOG.log(Level.SEVERE, "Exception while processing: "
+ LOG.error( "Exception while processing: "
+ entity.name + " document : " + doc, e);
}
if (e.getErrCode() == DataImportHandlerException.SEVERE)
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EntityProcessorBase.java Wed Sep 17 19:16:26 2008
@@ -18,8 +18,8 @@
import java.lang.reflect.Method;
import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -37,8 +37,7 @@
* @since solr 1.3
*/
public class EntityProcessorBase extends EntityProcessor {
- private static final Logger LOG = Logger.getLogger(EntityProcessorBase.class
- .getName());
+ private static final Logger log = LoggerFactory.getLogger(EntityProcessorBase.class);
protected String entityName;
@@ -102,14 +101,14 @@
String msg = "Transformer :"
+ trans
+ "does not implement Transformer interface or does not have a transformRow(Map m)method";
- LOG.log(Level.SEVERE, msg);
+ log.error( msg);
throw new DataImportHandlerException(
DataImportHandlerException.SEVERE, msg);
}
transformers.add(new ReflectionTransformer(meth, clazz, trans));
}
} catch (Exception e) {
- LOG.log(Level.SEVERE, "Unable to load Transformer: " + aTransArr, e);
+ log.error( "Unable to load Transformer: " + aTransArr, e);
throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
e);
}
@@ -139,8 +138,7 @@
try {
return meth.invoke(o, aRow);
} catch (Exception e) {
- LOG.log(Level.WARNING, "method invocation failed on transformer : "
- + trans, e);
+ log.warn("method invocation failed on transformer : "+ trans, e);
throw new DataImportHandlerException(DataImportHandlerException.WARN, e);
}
}
@@ -176,9 +174,7 @@
} else if (o instanceof List) {
tmpRows.addAll((List) o);
} else {
- LOG
- .log(Level.SEVERE,
- "Transformer must return Map<String, Object> or a List<Map<String, Object>>");
+ log.error("Transformer must return Map<String, Object> or a List<Map<String, Object>>");
}
}
rows = tmpRows;
@@ -193,16 +189,14 @@
} else if (o instanceof List) {
rows = (List) o;
} else {
- LOG
- .log(Level.SEVERE,
- "Transformer must return Map<String, Object> or a List<Map<String, Object>>");
+ log.error( "Transformer must return Map<String, Object> or a List<Map<String, Object>>");
}
}
} catch (DataImportHandlerException e) {
throw e;
} catch (Exception e) {
- LOG.log(Level.WARNING, "transformer threw error", e);
+ log.warn( "transformer threw error", e);
throw new DataImportHandlerException(DataImportHandlerException.WARN, e);
}
}
@@ -232,7 +226,7 @@
query = null;
return null;
} catch (Exception e) {
- LOG.log(Level.SEVERE, "getNext() failed for query '" + query + "'", e);
+ log.error( "getNext() failed for query '" + query + "'", e);
rowIterator = null;
query = null;
throw new DataImportHandlerException(DataImportHandlerException.WARN, e);
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java Wed Sep 17 19:16:26 2008
@@ -22,8 +22,8 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -45,7 +45,7 @@
* @since solr 1.3
*/
public class HttpDataSource extends DataSource<Reader> {
- Logger LOG = Logger.getLogger(HttpDataSource.class.getName());
+ Logger LOG = LoggerFactory.getLogger(HttpDataSource.class);
private String baseUrl;
@@ -68,14 +68,14 @@
try {
connectionTimeout = Integer.parseInt(cTimeout);
} catch (NumberFormatException e) {
- LOG.log(Level.WARNING, "Invalid connection timeout: " + cTimeout);
+ LOG.warn( "Invalid connection timeout: " + cTimeout);
}
}
if (rTimeout != null) {
try {
readTimeout = Integer.parseInt(rTimeout);
} catch (NumberFormatException e) {
- LOG.log(Level.WARNING, "Invalid read timeout: " + rTimeout);
+ LOG.warn( "Invalid read timeout: " + rTimeout);
}
}
@@ -111,7 +111,7 @@
DataImporter.QUERY_COUNT.get().incrementAndGet();
return new InputStreamReader(in, enc);
} catch (Exception e) {
- LOG.log(Level.SEVERE, "Exception thrown while getting data", e);
+ LOG.error( "Exception thrown while getting data", e);
throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
"Exception in invoking url " + url, e);
}
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java Wed Sep 17 19:16:26 2008
@@ -21,8 +21,8 @@
import java.sql.*;
import java.util.*;
import java.util.concurrent.Callable;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -42,8 +42,7 @@
*/
public class JdbcDataSource extends
DataSource<Iterator<Map<String, Object>>> {
- private static final Logger LOG = Logger.getLogger(JdbcDataSource.class
- .getName());
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcDataSource.class);
private Callable<Connection> factory;
@@ -71,7 +70,7 @@
if (batchSize == -1)
batchSize = Integer.MIN_VALUE;
} catch (NumberFormatException e) {
- LOG.log(Level.WARNING, "Invalid batch size: " + bsz);
+ LOG.warn( "Invalid batch size: " + bsz);
}
}
@@ -145,7 +144,7 @@
}
private void logError(String msg, Exception e) {
- LOG.log(Level.WARNING, msg, e);
+ LOG.warn( msg, e);
}
private List<String> readFieldNames(ResultSetMetaData metaData)
@@ -174,12 +173,12 @@
stmt = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
ResultSet.CONCUR_READ_ONLY);
stmt.setFetchSize(batchSize);
- LOG.finer("Executing SQL: " + query);
+ LOG.debug("Executing SQL: " + query);
long start = System.currentTimeMillis();
if (stmt.execute(query)) {
resultSet = stmt.getResultSet();
}
- LOG.finest("Time taken for sql :"
+ LOG.trace("Time taken for sql :"
+ (System.currentTimeMillis() - start));
colNames = readFieldNames(resultSet.getMetaData());
} catch (Exception e) {
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java Wed Sep 17 19:16:26 2008
@@ -17,8 +17,8 @@
package org.apache.solr.handler.dataimport;
import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -40,8 +40,7 @@
* @since solr 1.3
*/
public class RegexTransformer extends Transformer {
- private static final Logger LOG = Logger.getLogger(RegexTransformer.class
- .getName());
+ private static final Logger LOG = LoggerFactory.getLogger(RegexTransformer.class);
@SuppressWarnings("unchecked")
public Map<String, Object> transformRow(Map<String, Object> row,
@@ -112,8 +111,7 @@
try {
l.add(m.group(i));
} catch (Exception e) {
- LOG.log(Level.WARNING, "Parsing failed for field : " + columnName,
- e);
+ LOG.warn("Parsing failed for field : " + columnName, e);
}
}
return l;
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java Wed Sep 17 19:16:26 2008
@@ -16,7 +16,6 @@
*/
package org.apache.solr.handler.dataimport;
-import org.apache.lucene.document.Document;
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.CommitUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
@@ -27,8 +26,8 @@
import java.text.ParseException;
import java.util.Date;
import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -42,8 +41,7 @@
* @since solr 1.3
*/
public abstract class SolrWriter {
- private static final Logger LOG = Logger
- .getLogger(SolrWriter.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(SolrWriter.class);
static final String IMPORTER_PROPERTIES = "dataimport.properties";
@@ -68,10 +66,10 @@
command.overwriteCommitted = true;
processor.processAdd(command);
} catch (IOException e) {
- LOG.log(Level.SEVERE, "Exception while adding: " + d, e);
+ log.error( "Exception while adding: " + d, e);
return false;
} catch (Exception e) {
- LOG.log(Level.WARNING, "Error creating document : " + d, e);
+ log.warn( "Error creating document : " + d, e);
return false;
}
@@ -80,14 +78,14 @@
public void deleteDoc(Object id) {
try {
- LOG.info("deleted from document to Solr: " + id);
+ log.info("deleted from document to Solr: " + id);
DeleteUpdateCommand delCmd = new DeleteUpdateCommand();
delCmd.id = id.toString();
delCmd.fromPending = true;
delCmd.fromCommitted = true;
processor.processDelete(delCmd);
} catch (IOException e) {
- LOG.log(Level.SEVERE, "Exception while deleteing: " + id, e);
+ log.error( "Exception while deleteing: " + id, e);
}
}
@@ -120,7 +118,7 @@
filePath += SolrWriter.IMPORTER_PROPERTIES;
propOutput = new FileOutputStream(filePath);
props.store(propOutput, null);
- LOG.info("Wrote last indexed time to " + SolrWriter.IMPORTER_PROPERTIES);
+ log.info("Wrote last indexed time to " + SolrWriter.IMPORTER_PROPERTIES);
} catch (FileNotFoundException e) {
throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
"Unable to persist Index Start Time", e);
@@ -145,10 +143,9 @@
propInput = new FileInputStream(configDir
+ SolrWriter.IMPORTER_PROPERTIES);
props.load(propInput);
- LOG.info("Read " + SolrWriter.IMPORTER_PROPERTIES);
+ log.info("Read " + SolrWriter.IMPORTER_PROPERTIES);
} catch (Exception e) {
- LOG.log(Level.WARNING, "Unable to read: "
- + SolrWriter.IMPORTER_PROPERTIES);
+ log.warn( "Unable to read: " + SolrWriter.IMPORTER_PROPERTIES);
} finally {
try {
if (propInput != null)
@@ -163,14 +160,14 @@
public void deleteByQuery(String query) {
try {
- LOG.info("Deleting documents from Solr with query: " + query);
+ log.info("Deleting documents from Solr with query: " + query);
DeleteUpdateCommand delCmd = new DeleteUpdateCommand();
delCmd.query = query;
delCmd.fromCommitted = true;
delCmd.fromPending = true;
processor.processDelete(delCmd);
} catch (IOException e) {
- LOG.log(Level.SEVERE, "Exception while deleting by query: " + query, e);
+ log.error( "Exception while deleting by query: " + query, e);
}
}
@@ -179,7 +176,7 @@
CommitUpdateCommand commit = new CommitUpdateCommand(optimize);
processor.processCommit(commit);
} catch (Exception e) {
- LOG.log(Level.SEVERE, "Exception while solr commit.", e);
+ log.error( "Exception while solr commit.", e);
}
}
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java Wed Sep 17 19:16:26 2008
@@ -18,8 +18,8 @@
import java.util.Iterator;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -42,8 +42,7 @@
* @since solr 1.3
*/
public class SqlEntityProcessor extends EntityProcessorBase {
- private static final Logger LOG = Logger.getLogger(SqlEntityProcessor.class
- .getName());
+ private static final Logger LOG = LoggerFactory.getLogger(SqlEntityProcessor.class);
protected DataSource<Iterator<Map<String, Object>>> dataSource;
@@ -61,7 +60,7 @@
} catch (DataImportHandlerException e) {
throw e;
} catch (Exception e) {
- LOG.log(Level.SEVERE, "The query failed '" + q + "'", e);
+ LOG.error( "The query failed '" + q + "'", e);
throw new DataImportHandlerException(DataImportHandlerException.SEVERE, e);
}
}
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java Wed Sep 17 19:16:26 2008
@@ -19,7 +19,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -47,8 +48,7 @@
*/
public class TemplateTransformer extends Transformer {
- private static final Logger LOG = Logger.getLogger(TemplateTransformer.class
- .getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TemplateTransformer.class);
@SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> row, Context context) {
@@ -86,7 +86,7 @@
List<String> variables = TemplateString.getVariables(expr);
for (String v : variables) {
if (resolver.resolve(v) == null) {
- LOG.warning("Unable to resolve variable: " + v
+ LOG.warn("Unable to resolve variable: " + v
+ " while parsing expression: " + expr);
resolvable = false;
}
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java Wed Sep 17 19:16:26 2008
@@ -29,7 +29,8 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -51,8 +52,7 @@
* @since solr 1.3
*/
public class XPathEntityProcessor extends EntityProcessorBase {
- private static final Logger LOG = Logger.getLogger(XPathEntityProcessor.class
- .getName());
+ private static final Logger LOG = LoggerFactory.getLogger(XPathEntityProcessor.class);
protected List<String> placeHolderVariables;
Added: lucene/solr/trunk/lib/slf4j-api-1.5.3.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/slf4j-api-1.5.3.jar?rev=696539&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/trunk/lib/slf4j-api-1.5.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/trunk/lib/slf4j-jdk14-1.5.3.jar
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/lib/slf4j-jdk14-1.5.3.jar?rev=696539&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/trunk/lib/slf4j-jdk14-1.5.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java Wed Sep 17 19:16:26 2008
@@ -19,7 +19,8 @@
import java.util.Map;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -28,7 +29,7 @@
* @version $Id$
*/
public abstract class BaseTokenFilterFactory implements TokenFilterFactory {
- final static Logger log = Logger.getLogger(BaseTokenFilterFactory.class.getName());
+ public static final Logger log = LoggerFactory.getLogger(BaseTokenFilterFactory.class);
/** The init args */
protected Map<String,String> args;
Modified: lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java Wed Sep 17 19:16:26 2008
@@ -18,7 +18,8 @@
package org.apache.solr.analysis;
import java.util.Map;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -27,7 +28,7 @@
* @version $Id$
*/
public abstract class BaseTokenizerFactory implements TokenizerFactory {
- final static Logger log = Logger.getLogger(BaseTokenizerFactory.class.getName());
+ public static final Logger log = LoggerFactory.getLogger(BaseTokenizerFactory.class);
/** The init args */
protected Map<String,String> args;
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/SolrException.java Wed Sep 17 19:16:26 2008
@@ -17,7 +17,8 @@
package org.apache.solr.common;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.CharArrayWriter;
import java.io.PrintWriter;
@@ -129,14 +130,14 @@
public void log(Logger log) { log(log,this); }
public static void log(Logger log, Throwable e) {
- log.severe(toStr(e));
+ log.error(toStr(e));
if (e instanceof SolrException) {
((SolrException)e).logged = true;
}
}
public static void log(Logger log, String msg, Throwable e) {
- log.severe(msg + ':' + toStr(e));
+ log.error(msg + ':' + toStr(e));
if (e instanceof SolrException) {
((SolrException)e).logged = true;
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/common/util/StrUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/common/util/StrUtils.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/common/util/StrUtils.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/common/util/StrUtils.java Wed Sep 17 19:16:26 2008
@@ -62,7 +62,7 @@
/***
if (SolrCore.log.isLoggable(Level.FINEST)) {
- SolrCore.log.finest("splitCommand=" + lst);
+ SolrCore.log.trace("splitCommand=" + lst);
}
***/
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/Config.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/Config.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/Config.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/Config.java Wed Sep 17 19:16:26 2008
@@ -30,13 +30,14 @@
import javax.xml.namespace.QName;
import java.io.*;
import java.util.List;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Id$
*/
public class Config {
- public static final Logger log = Logger.getLogger(Config.class.getName());
+ public static final Logger log = LoggerFactory.getLogger(Config.class);
static final XPathFactory xpathFactory = XPathFactory.newInstance();
@@ -170,12 +171,12 @@
if (errIfMissing) {
throw new RuntimeException(name + " missing "+path);
} else {
- log.fine(name + " missing optional " + path);
+ log.debug(name + " missing optional " + path);
return null;
}
}
- log.finest(name + ":" + path + "=" + nd);
+ log.trace(name + ":" + path + "=" + nd);
return nd;
} catch (XPathExpressionException e) {
@@ -195,7 +196,7 @@
String txt = DOMUtil.getText(nd);
- log.fine(name + ' '+path+'='+txt);
+ log.debug(name + ' '+path+'='+txt);
return txt;
/******
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/CoreContainer.java Wed Sep 17 19:16:26 2008
@@ -26,7 +26,8 @@
import java.io.Writer;
import java.nio.channels.FileChannel;
import java.util.*;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathConstants;
@@ -50,7 +51,7 @@
*/
public class CoreContainer
{
- protected static Logger log = Logger.getLogger(CoreContainer.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(CoreContainer.class);
protected final Map<String, SolrCore> cores = new LinkedHashMap<String, SolrCore>();
protected boolean persistent = false;
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/JmxMonitoredMap.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/JmxMonitoredMap.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/JmxMonitoredMap.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/JmxMonitoredMap.java Wed Sep 17 19:16:26 2008
@@ -27,8 +27,8 @@
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -46,7 +46,7 @@
*/
public class JmxMonitoredMap<K, V> extends
ConcurrentHashMap<String, SolrInfoMBean> {
- private static final Logger LOG = Logger.getLogger(JmxMonitoredMap.class
+ private static final Logger LOG = LoggerFactory.getLogger(JmxMonitoredMap.class
.getName());
private MBeanServer server = null;
@@ -136,7 +136,7 @@
SolrDynamicMBean mbean = new SolrDynamicMBean(infoBean);
server.registerMBean(mbean, name);
} catch (Exception e) {
- LOG.log(Level.WARNING, "Failed to register info bean: " + key, e);
+ LOG.warn( "Failed to register info bean: " + key, e);
}
}
@@ -156,7 +156,7 @@
try {
unregister((String) key, infoBean);
} catch (RuntimeException e) {
- LOG.log(Level.WARNING, "Failed to unregister info bean: " + key, e);
+ LOG.warn( "Failed to unregister info bean: " + key, e);
}
}
return super.remove(key);
@@ -231,7 +231,7 @@
}
}
} catch (Exception e) {
- LOG.log(Level.WARNING, "Could not getStatistics on info bean "
+ LOG.warn( "Could not getStatistics on info bean "
+ infoBean.getName(), e);
}
@@ -272,7 +272,7 @@
try {
list.add(new Attribute(attribute, getAttribute(attribute)));
} catch (Exception e) {
- LOG.warning("Could not get attibute " + attribute);
+ LOG.warn("Could not get attibute " + attribute);
}
}
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -21,7 +21,8 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.xpath.XPathConstants;
@@ -43,7 +44,7 @@
/**
*/
final class RequestHandlers {
- public static Logger log = Logger.getLogger(RequestHandlers.class.getName());
+ public static Logger log = LoggerFactory.getLogger(RequestHandlers.class);
public static final String DEFAULT_HANDLER_NAME="standard";
protected final SolrCore core;
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/RunExecutableListener.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/RunExecutableListener.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/RunExecutableListener.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/RunExecutableListener.java Wed Sep 17 19:16:26 2008
@@ -25,7 +25,6 @@
import java.io.IOException;
import java.util.List;
import java.util.ArrayList;
-import java.util.logging.Level;
/**
*/
@@ -66,9 +65,9 @@
int ret = 0;
try {
- boolean doLog = log.isLoggable(Level.FINE);
+ boolean doLog = log.isDebugEnabled();
if (doLog) {
- log.fine("About to exec " + cmd[0]);
+ log.debug("About to exec " + cmd[0]);
}
Process proc = Runtime.getRuntime().exec(cmd, envp ,dir);
@@ -81,7 +80,7 @@
}
if (wait && doLog) {
- log.fine("Executable " + cmd[0] + " returned " + ret);
+ log.debug("Executable " + cmd[0] + " returned " + ret);
}
} catch (IOException e) {
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -34,7 +34,6 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.StringTokenizer;
-import java.util.logging.Level;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.io.IOException;
@@ -248,8 +247,7 @@
try {
return valueOf(s.toUpperCase());
} catch (Exception e) {
- log.log(Level.WARNING,
- "Unrecognized value for lastModFrom: " + s, e);
+ log.warn( "Unrecognized value for lastModFrom: " + s, e);
return BOGUS;
}
}
@@ -282,10 +280,9 @@
? Long.valueOf(ttlStr)
: null;
} catch (Exception e) {
- log.log(Level.WARNING,
- "Ignoring exception while attempting to " +
- "extract max-age from cacheControl config: " +
- cacheControlHeader, e);
+ log.warn( "Ignoring exception while attempting to " +
+ "extract max-age from cacheControl config: " +
+ cacheControlHeader, e);
}
}
maxAge = tmp;
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -63,7 +63,8 @@
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.net.URL;
@@ -73,7 +74,7 @@
public final class SolrCore implements SolrInfoMBean {
public static final String version="1.0";
- public static Logger log = Logger.getLogger(SolrCore.class.getName());
+ public static Logger log = LoggerFactory.getLogger(SolrCore.class);
private String name;
private String logid; // used to show what name is set
@@ -106,7 +107,7 @@
boolean_query_max_clause_count = solrConfig.booleanQueryMaxClauseCount;
BooleanQuery.setMaxClauseCount(boolean_query_max_clause_count);
} else if (boolean_query_max_clause_count != solrConfig.booleanQueryMaxClauseCount ) {
- log.fine("BooleanQuery.maxClauseCount= " +boolean_query_max_clause_count+ ", ignoring " +solrConfig.booleanQueryMaxClauseCount);
+ log.debug("BooleanQuery.maxClauseCount= " +boolean_query_max_clause_count+ ", ignoring " +solrConfig.booleanQueryMaxClauseCount);
}
}
}
@@ -284,14 +285,14 @@
// if it didn't exist already...
Directory dir = SolrIndexWriter.getDirectory(getIndexDir(), solrConfig.mainIndexConfig);
if (dir != null && IndexWriter.isLocked(dir)) {
- log.warning(logid+"WARNING: Solr index directory '" + getIndexDir() + "' is locked. Unlocking...");
+ log.warn(logid+"WARNING: Solr index directory '" + getIndexDir() + "' is locked. Unlocking...");
IndexWriter.unlock(dir);
}
}
// Create the index if it doesn't exist.
if(!indexExists) {
- log.warning(logid+"Solr index directory '" + dirFile + "' doesn't exist."
+ log.warn(logid+"Solr index directory '" + dirFile + "' doesn't exist."
+ " Creating new index...");
SolrIndexWriter writer = new SolrIndexWriter("SolrCore.initIndex",getIndexDir(), true, schema, solrConfig.mainIndexConfig);
@@ -610,7 +611,7 @@
if (count > 0) return;
if (count < 0) {
//throw new RuntimeException("Too many closes on " + this);
- log.severe("Too many close {count:"+count+"} on " + this + ". Please report this exception to solr-user@lucene.apache.org");
+ log.error("Too many close {count:"+count+"} on " + this + ". Please report this exception to solr-user@lucene.apache.org");
return;
}
log.info(logid+" CLOSING SolrCore " + this);
@@ -653,7 +654,7 @@
protected void finalize() {
if (getOpenCount() != 0) {
- log.severe("REFCOUNT ERROR: unreferenced " + this + " (" + getName() + ") has a reference count of " + getOpenCount());
+ log.error("REFCOUNT ERROR: unreferenced " + this + " (" + getName() + ") has a reference count of " + getOpenCount());
}
}
@@ -931,12 +932,12 @@
onDeckSearchers++;
if (onDeckSearchers < 1) {
// should never happen... just a sanity check
- log.severe(logid+"ERROR!!! onDeckSearchers is " + onDeckSearchers);
+ log.error(logid+"ERROR!!! onDeckSearchers is " + onDeckSearchers);
onDeckSearchers=1; // reset
} else if (onDeckSearchers > maxWarmingSearchers) {
onDeckSearchers--;
String msg="Error opening new searcher. exceeded limit of maxWarmingSearchers="+maxWarmingSearchers + ", try again later.";
- log.warning(logid+""+ msg);
+ log.warn(logid+""+ msg);
// HTTP 503==service unavailable, or 409==Conflict
throw new SolrException(SolrException.ErrorCode.SERVICE_UNAVAILABLE,msg,true);
} else if (onDeckSearchers > 1) {
@@ -1121,7 +1122,7 @@
}
if (onDeckSearchers < 0) {
// sanity check... should never happen
- log.severe(logid+"ERROR!!! onDeckSearchers after decrement=" + onDeckSearchers);
+ log.error(logid+"ERROR!!! onDeckSearchers after decrement=" + onDeckSearchers);
onDeckSearchers=0; // try and recover
}
// if we failed, we need to wake up at least one waiter to continue the process
@@ -1151,7 +1152,7 @@
}
resource.close();
} catch (IOException e) {
- log.severe("Error closing searcher:" + SolrException.toStr(e));
+ log.error("Error closing searcher:" + SolrException.toStr(e));
}
}
};
@@ -1208,7 +1209,7 @@
public void execute(SolrRequestHandler handler, SolrQueryRequest req, SolrQueryResponse rsp) {
if (handler==null) {
- log.warning(logid+"Null Request Handler '" + req.getQueryType() +"' :" + req);
+ log.warn(logid+"Null Request Handler '" + req.getQueryType() +"' :" + req);
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,"Null Request Handler '" + req.getQueryType() + "'", true);
}
// setup response header and handle request
@@ -1240,7 +1241,7 @@
public void execute(SolrQueryRequest req, SolrQueryResponse rsp) {
SolrRequestHandler handler = getRequestHandler(req.getQueryType());
if (handler==null) {
- log.warning(logid+"Unknown Request Handler '" + req.getQueryType() +"' :" + req);
+ log.warn(logid+"Unknown Request Handler '" + req.getQueryType() +"' :" + req);
throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,"Unknown Request Handler '" + req.getQueryType() + "'", true);
}
execute(handler, req, rsp);
@@ -1414,7 +1415,7 @@
// TODO -- this should be removed in deprecation release...
String gettable = solrConfig.get("admin/gettableFiles", null );
if( gettable != null ) {
- log.warning(
+ log.warn(
"solrconfig.xml uses deprecated <admin/gettableFiles>, Please "+
"update your config to use the ShowFileRequestHandler." );
if( getRequestHandler( "/admin/file" ) == null ) {
@@ -1442,7 +1443,7 @@
handler.init( args );
reqHandlers.register("/admin/file", handler);
- log.warning( "adding ShowFileRequestHandler with hidden files: "+hide );
+ log.warn( "adding ShowFileRequestHandler with hidden files: "+hide );
}
}
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrEventListener.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrEventListener.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrEventListener.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrEventListener.java Wed Sep 17 19:16:26 2008
@@ -20,13 +20,14 @@
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.SolrIndexSearcher;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Id$
*/
public interface SolrEventListener {
- static final Logger log = Logger.getLogger(SolrCore.class.getName());
+ static final Logger log = LoggerFactory.getLogger(SolrCore.class);
public void init(NamedList args);
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -28,7 +28,8 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.util.*;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.nio.charset.Charset;
import javax.naming.Context;
@@ -54,7 +55,7 @@
*/
public class SolrResourceLoader implements ResourceLoader
{
- public static final Logger log = Logger.getLogger(SolrResourceLoader.class.getName());
+ public static final Logger log = LoggerFactory.getLogger(SolrResourceLoader.class);
static final String project = "solr";
static final String base = "org.apache" + "." + project;
@@ -263,7 +264,7 @@
for (String subpackage : subpackages) {
try {
String name = base + '.' + subpackage + newName;
- log.finest("Trying class name " + name);
+ log.trace("Trying class name " + name);
return Class.forName(name, true, classLoader);
} catch (ClassNotFoundException e1) {
// ignore... assume first exception is best.
@@ -354,7 +355,7 @@
} catch (NamingException e) {
log.info("No /"+project+"/home in JNDI");
} catch( RuntimeException ex ) {
- log.warning("Odd RuntimeException while testing for JNDI: " + ex.getMessage());
+ log.warn("Odd RuntimeException while testing for JNDI: " + ex.getMessage());
}
// Now try system property
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -43,7 +43,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -51,7 +52,7 @@
**/
public class AnalysisRequestHandler extends RequestHandlerBase {
- public static Logger log = Logger.getLogger(AnalysisRequestHandler.class.getName());
+ public static Logger log = LoggerFactory.getLogger(AnalysisRequestHandler.class);
private XMLInputFactory inputFactory;
@@ -72,7 +73,7 @@
catch (IllegalArgumentException ex) {
// Other implementations will likely throw this exception since "reuse-instance"
// isimplementation specific.
- log.fine("Unable to set the 'reuse-instance' property for the input factory: " + inputFactory);
+ log.debug("Unable to set the 'reuse-instance' property for the input factory: " + inputFactory);
}
}
@@ -107,7 +108,7 @@
case XMLStreamConstants.START_ELEMENT: {
String currTag = parser.getLocalName();
if ("doc".equals(currTag)) {
- log.finest("Tokenizing doc...");
+ log.trace("Tokenizing doc...");
SolrInputDocument doc = readDoc(parser);
SchemaField uniq = schema.getUniqueKeyField();
@@ -181,7 +182,7 @@
text.setLength(0);
String localName = parser.getLocalName();
if (!"field".equals(localName)) {
- log.warning("unexpected XML tag doc/" + localName);
+ log.warn("unexpected XML tag doc/" + localName);
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
"unexpected XML tag doc/" + localName);
}
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -39,7 +39,8 @@
import java.io.IOException;
import java.net.URL;
import java.util.Arrays;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Takes a string (e.g. a query string) as the value of the "q" parameter
@@ -196,7 +197,7 @@
@Deprecated
public class SpellCheckerRequestHandler extends RequestHandlerBase implements SolrCoreAware {
- private static Logger log = Logger.getLogger(SpellCheckerRequestHandler.class.getName());
+ private static Logger log = LoggerFactory.getLogger(SpellCheckerRequestHandler.class);
private SpellChecker spellChecker;
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -22,7 +22,8 @@
import java.io.Writer;
import java.io.File;
import java.util.HashMap;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javanet.staxutils.BaseXMLInputFactory;
@@ -58,7 +59,7 @@
*/
public class XmlUpdateRequestHandler extends RequestHandlerBase
{
- public static Logger log = Logger.getLogger(XmlUpdateRequestHandler.class.getName());
+ public static Logger log = LoggerFactory.getLogger(XmlUpdateRequestHandler.class);
public static final String UPDATE_PROCESSOR = "update.processor";
@@ -96,7 +97,7 @@
catch( IllegalArgumentException ex ) {
// Other implementations will likely throw this exception since "reuse-instance"
// isimplementation specific.
- log.fine( "Unable to set the 'reuse-instance' property for the input chain: "+inputFactory );
+ log.debug( "Unable to set the 'reuse-instance' property for the input chain: "+inputFactory );
}
}
@@ -154,7 +155,7 @@
case XMLStreamConstants.START_ELEMENT:
String currTag = parser.getLocalName();
if (currTag.equals(ADD)) {
- log.finest("SolrCore.update(add)");
+ log.trace("SolrCore.update(add)");
addCmd = new AddUpdateCommand();
boolean overwrite=true; // the default
@@ -173,7 +174,7 @@
} else if ( OVERWRITE_COMMITTED.equals(attrName) ) {
overwriteCommitted = StrUtils.parseBoolean(attrVal);
} else {
- log.warning("Unknown attribute id in add:" + attrName);
+ log.warn("Unknown attribute id in add:" + attrName);
}
}
@@ -190,13 +191,13 @@
addCmd.allowDups = !overwrite;
}
else if ("doc".equals(currTag)) {
- log.finest("adding doc...");
+ log.trace("adding doc...");
addCmd.clear();
addCmd.solrDoc = readDoc( parser );
processor.processAdd(addCmd);
}
else if ( COMMIT.equals(currTag) || OPTIMIZE.equals(currTag)) {
- log.finest("parsing " + currTag);
+ log.trace("parsing " + currTag);
CommitUpdateCommand cmd = new CommitUpdateCommand(OPTIMIZE.equals(currTag));
@@ -214,7 +215,7 @@
cmd.maxOptimizeSegments = Integer.parseInt(attrVal);
}
else {
- log.warning("unexpected attribute commit/@" + attrName);
+ log.warn("unexpected attribute commit/@" + attrName);
}
}
@@ -226,7 +227,7 @@
processor.processCommit( cmd );
} // end commit
else if (DELETE.equals(currTag)) {
- log.finest("parsing delete");
+ log.trace("parsing delete");
processDelete( processor, parser);
} // end delete
break;
@@ -251,7 +252,7 @@
} else if ("fromCommitted".equals(attrName)) {
deleteCmd.fromCommitted = StrUtils.parseBoolean(attrVal);
} else {
- log.warning("unexpected attribute delete/@" + attrName);
+ log.warn("unexpected attribute delete/@" + attrName);
}
}
@@ -262,7 +263,7 @@
case XMLStreamConstants.START_ELEMENT:
String mode = parser.getLocalName();
if (!("id".equals(mode) || "query".equals(mode))) {
- log.warning("unexpected XML tag /delete/" + mode);
+ log.warn("unexpected XML tag /delete/" + mode);
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
"unexpected XML tag /delete/" + mode);
}
@@ -278,7 +279,7 @@
} else if( "delete".equals( currTag ) ) {
return;
} else {
- log.warning("unexpected XML tag /delete/" + currTag);
+ log.warn("unexpected XML tag /delete/" + currTag);
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
"unexpected XML tag /delete/" + currTag);
}
@@ -309,7 +310,7 @@
if ("boost".equals(attrName)) {
doc.setDocumentBoost( Float.parseFloat(parser.getAttributeValue(i)) );
} else {
- log.warning("Unknown attribute doc/@" + attrName);
+ log.warn("Unknown attribute doc/@" + attrName);
}
}
@@ -343,7 +344,7 @@
text.setLength(0);
String localName = parser.getLocalName();
if (!"field".equals(localName)) {
- log.warning("unexpected XML tag doc/" + localName);
+ log.warn("unexpected XML tag doc/" + localName);
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
"unexpected XML tag doc/" + localName);
}
@@ -359,7 +360,7 @@
} else if ("null".equals(attrName)) {
isNull = StrUtils.parseBoolean(attrVal);
} else {
- log.warning("Unknown attribute doc/field/@" + attrName);
+ log.warn("Unknown attribute doc/field/@" + attrName);
}
}
break;
@@ -399,7 +400,7 @@
SolrException.logOnce(log, "Error processing \"legacy\" update command", ex);
XML.writeXML(output, "result", SolrException.toStr(ex), "status", "1");
} catch (Exception ee) {
- log.severe("Error writing to output stream: " + ee);
+ log.error("Error writing to output stream: " + ee);
}
}
}
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -29,8 +29,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
@@ -82,7 +82,7 @@
*/
public class LukeRequestHandler extends RequestHandlerBase
{
- private static Logger log = Logger.getLogger(LukeRequestHandler.class.getName());
+ private static Logger log = LoggerFactory.getLogger(LukeRequestHandler.class);
public static final String NUMTERMS = "numTerms";
public static final String DOC_ID = "docId";
@@ -261,7 +261,7 @@
}
}
catch( Exception ex ) {
- log.log( Level.WARNING, "error writing term vector", ex );
+ log.warn( "error writing term vector", ex );
}
}
@@ -322,7 +322,7 @@
}
}
catch( Exception ex ) {
- log.warning( "error reading field: "+fieldName );
+ log.warn( "error reading field: "+fieldName );
}
// Find one document so we can get the fieldable
}
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Wed Sep 17 19:16:26 2008
@@ -29,7 +29,8 @@
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -77,7 +78,7 @@
*/
public class QueryElevationComponent extends SearchComponent implements SolrCoreAware
{
- private static Logger log = Logger.getLogger(QueryElevationComponent.class.getName());
+ private static Logger log = LoggerFactory.getLogger(QueryElevationComponent.class);
// Constants used in solrconfig.xml
static final String FIELD_TYPE = "queryFieldType";
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=696539&r1=696538&r2=696539&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 Wed Sep 17 19:16:26 2008
@@ -39,7 +39,8 @@
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.HttpClient;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.*;
import java.util.concurrent.*;
@@ -54,7 +55,7 @@
static final String INIT_FIRST_COMPONENTS = "first-components";
static final String INIT_LAST_COMPONENTS = "last-components";
- protected static Logger log = Logger.getLogger(SearchHandler.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(SearchHandler.class);
protected List<SearchComponent> components = null;
@@ -133,7 +134,7 @@
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception, ParseException, InstantiationException, IllegalAccessException
{
// int sleep = req.getParams().getInt("sleep",0);
- // if (sleep > 0) {log.severe("SLEEPING for " + sleep); Thread.sleep(sleep);}
+ // if (sleep > 0) {log.error("SLEEPING for " + sleep); Thread.sleep(sleep);}
ResponseBuilder rb = new ResponseBuilder();
rb.req = req;
rb.rsp = rsp;
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/SpellCheckComponent.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/SpellCheckComponent.java Wed Sep 17 19:16:26 2008
@@ -27,8 +27,8 @@
import java.util.Map;
import java.util.Collections;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.xpath.XPathConstants;
@@ -67,7 +67,7 @@
* @since solr 1.3
*/
public class SpellCheckComponent extends SearchComponent implements SolrCoreAware, SpellingParams {
- private static final Logger LOG = Logger.getLogger(SpellCheckComponent.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(SpellCheckComponent.class);
public static final boolean DEFAULT_ONLY_MORE_POPULAR = false;
@@ -235,7 +235,7 @@
}
String collVal = collation.toString();
if (collVal.equals(origQuery) == false) {
- LOG.fine("Collation:" + collation);
+ LOG.debug("Collation:" + collation);
result.add("collation", collVal);
}
}
@@ -295,7 +295,7 @@
//ensure that there is at least one query converter defined
if (queryConverters.size() == 0) {
- LOG.warning("No queryConverter defined, using default converter");
+ LOG.warn("No queryConverter defined, using default converter");
queryConverters.put("queryConverter", new SpellingQueryConverter());
}
@@ -335,7 +335,7 @@
+ checker.getDictionaryName());
checker.reload();
} catch (IOException e) {
- LOG.log(Level.SEVERE, "Exception in reloading spell check index for spellchecker: " + checker.getDictionaryName(), e);
+ log.error( "Exception in reloading spell check index for spellchecker: " + checker.getDictionaryName(), e);
}
} else {
// newSearcher event
@@ -343,7 +343,7 @@
LOG.info("Building spell index for spell checker: " + checker.getDictionaryName());
checker.build(core, newSearcher);
} catch (Exception e) {
- LOG.log(Level.SEVERE,
+ log.error(
"Exception in building spell check index for spellchecker: " + checker.getDictionaryName(), e);
}
}
@@ -369,17 +369,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/highlight/SolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/highlight/SolrHighlighter.java Wed Sep 17 19:16:26 2008
@@ -20,7 +20,8 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.lucene.search.Query;
import org.apache.solr.common.params.HighlightParams;
@@ -33,7 +34,7 @@
public abstract class SolrHighlighter
{
- public static Logger log = Logger.getLogger(SolrHighlighter.class.getName());
+ public static Logger log = LoggerFactory.getLogger(SolrHighlighter.class);
// Thread safe registry
protected final Map<String,SolrFormatter> formatters =
Modified: lucene/solr/trunk/src/java/org/apache/solr/request/XSLTResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/request/XSLTResponseWriter.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/request/XSLTResponseWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/request/XSLTResponseWriter.java Wed Sep 17 19:16:26 2008
@@ -24,7 +24,8 @@
import java.io.Reader;
import java.io.Writer;
import java.util.Map;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
@@ -50,7 +51,7 @@
public static final int XSLT_CACHE_DEFAULT = 60;
private static final String XSLT_CACHE_PARAM = "xsltCacheLifetimeSeconds";
- private static final Logger log = Logger.getLogger(XSLTResponseWriter.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(XSLTResponseWriter.class);
public void init(NamedList n) {
final SolrParams p = SolrParams.toSolrParams(n);
Modified: lucene/solr/trunk/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/schema/FieldType.java?rev=696539&r1=696538&r2=696539&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/schema/FieldType.java Wed Sep 17 19:16:26 2008
@@ -33,7 +33,8 @@
import org.apache.solr.analysis.SolrAnalyzer;
import org.apache.solr.common.SolrException;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Map;
import java.util.HashMap;
import java.io.Reader;
@@ -45,7 +46,7 @@
* @version $Id$
*/
public abstract class FieldType extends FieldProperties {
- public static final Logger log = Logger.getLogger(FieldType.class.getName());
+ public static final Logger log = LoggerFactory.getLogger(FieldType.class);
/** The name of the type (not the name of the field) */
protected String typeName;
@@ -182,7 +183,7 @@
}
if (val==null) return null;
if (!field.indexed() && !field.stored()) {
- log.finest("Ignoring unindexed/unstored field: " + field);
+ log.trace("Ignoring unindexed/unstored field: " + field);
return null;
}
@@ -364,7 +365,7 @@
*/
public void setAnalyzer(Analyzer analyzer) {
this.analyzer = analyzer;
- log.finest("FieldType: " + typeName + ".setAnalyzer(" + analyzer.getClass().getName() + ")" );
+ log.trace("FieldType: " + typeName + ".setAnalyzer(" + analyzer.getClass().getName() + ")" );
}
/**
@@ -373,7 +374,7 @@
*/
public void setQueryAnalyzer(Analyzer analyzer) {
this.queryAnalyzer = analyzer;
- log.finest("FieldType: " + typeName + ".setQueryAnalyzer(" + analyzer.getClass().getName() + ")" );
+ log.trace("FieldType: " + typeName + ".setQueryAnalyzer(" + analyzer.getClass().getName() + ")" );
}
/**