You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/04/03 01:27:16 UTC
svn commit: r1584214 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/servlet/
Author: uschindler
Date: Wed Apr 2 23:27:15 2014
New Revision: 1584214
URL: http://svn.apache.org/r1584214
Log:
Merged revision(s) 1584213 from lucene/dev/trunk:
SOLR-5951: Fixed SolrDispatchFilter to throw useful exception on startup if SLF4j logging jars are missing
Added:
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/BaseSolrFilter.java
- copied unchanged from r1584213, lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/BaseSolrFilter.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/BaseSolrServlet.java
- copied unchanged from r1584213, lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/BaseSolrServlet.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java
- copied unchanged from r1584213, lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1584214&r1=1584213&r2=1584214&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Apr 2 23:27:15 2014
@@ -133,6 +133,9 @@ Bug Fixes
* SOLR-5943: SolrCmdDistributor does not distribute the openSearcher parameter.
(ludovic Boutros via shalin)
+* SOLR-5951: Fixed SolrDispatchFilter to throw useful exception on startup if
+ SLF4j logging jars are missing. (Uwe Schindler, Hossman, Shawn Heisey)
+
Optimizations
----------------------
* SOLR-1880: Distributed Search skips GET_FIELDS stage if EXECUTE_QUERY
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java?rev=1584214&r1=1584213&r2=1584214&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java Wed Apr 2 23:27:15 2014
@@ -23,7 +23,6 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +37,7 @@ import org.apache.solr.core.SolrCore;
*
* @since solr 4.0
*/
-public final class LoadAdminUiServlet extends HttpServlet {
+public final class LoadAdminUiServlet extends BaseSolrServlet {
@Override
public void doGet(HttpServletRequest request,
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java?rev=1584214&r1=1584213&r2=1584214&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java Wed Apr 2 23:27:15 2014
@@ -21,14 +21,13 @@ import java.io.IOException;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* A Simple redirection servlet to help us deprecate old UI elements
*/
-public class RedirectServlet extends HttpServlet{
+public class RedirectServlet extends BaseSolrServlet {
static final String CONTEXT_KEY = "${context}";
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1584214&r1=1584213&r2=1584214&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Wed Apr 2 23:27:15 2014
@@ -72,7 +72,6 @@ import org.apache.solr.util.FastWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
@@ -106,13 +105,12 @@ import java.util.Set;
*
* @since solr 1.2
*/
-public class SolrDispatchFilter implements Filter
-{
+public class SolrDispatchFilter extends BaseSolrFilter {
private static final String CONNECTION_HEADER = "Connection";
private static final String TRANSFER_ENCODING_HEADER = "Transfer-Encoding";
private static final String CONTENT_LENGTH_HEADER = "Content-Length";
- final Logger log;
+ static final Logger log = LoggerFactory.getLogger(SolrDispatchFilter.class);
protected volatile CoreContainer cores;
@@ -123,16 +121,6 @@ public class SolrDispatchFilter implemen
private static final Charset UTF8 = StandardCharsets.UTF_8;
public SolrDispatchFilter() {
- try {
- log = LoggerFactory.getLogger(SolrDispatchFilter.class);
- } catch (NoClassDefFoundError e) {
- throw new SolrException(
- ErrorCode.SERVER_ERROR,
- "Could not find necessary SLF4j logging jars. If using Jetty, the SLF4j logging jars need to go in "
- +"the jetty lib/ext directory. For other containers, the corresponding directory should be used. "
- +"For more information, see: http://wiki.apache.org/solr/SolrLogging",
- e);
- }
}
@Override
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java?rev=1584214&r1=1584213&r2=1584214&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java Wed Apr 2 23:27:15 2014
@@ -26,7 +26,6 @@ import java.util.Date;
import java.util.List;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -50,7 +49,7 @@ import org.slf4j.LoggerFactory;
*
* @since solr 4.0
*/
-public final class ZookeeperInfoServlet extends HttpServlet {
+public final class ZookeeperInfoServlet extends BaseSolrServlet {
static final Logger log = LoggerFactory.getLogger(ZookeeperInfoServlet.class);
@Override