diff --git a/src/webapp/web/admin/_info.jsp b/src/webapp/web/admin/_info.jsp index 371f3047b77..d77e474cd5e 100644 --- a/src/webapp/web/admin/_info.jsp +++ b/src/webapp/web/admin/_info.jsp @@ -24,8 +24,6 @@ <%@ page import="org.apache.solr.util.XML"%> <%@ page import="org.apache.lucene.LucenePackage"%> <%@ page import="java.net.UnknownHostException" %> - - <% // SolrCore core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore"); @@ -106,4 +104,4 @@ String cwd=System.getProperty("user.dir"); String solrHome= solrConfig.getInstanceDir(); -%> +%> \ No newline at end of file diff --git a/src/webapp/web/admin/logging.jsp b/src/webapp/web/admin/logging.jsp index e94004e0981..85f0c4d501e 100644 --- a/src/webapp/web/admin/logging.jsp +++ b/src/webapp/web/admin/logging.jsp @@ -26,16 +26,9 @@ <%@ page import="java.util.logging.Logger"%> +<%@include file="_info.jsp" %> <% - SolrCore core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore"); - if (core == null) { - String coreParam = request.getParameter("core"); - core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam) : null; - } - if (core == null) - core = SolrCore.getSolrCore(); - Logger log = SolrCore.log; Logger parent = log.getParent(); while(parent != null) { diff --git a/src/webapp/web/admin/ping.jsp b/src/webapp/web/admin/ping.jsp index bdc962031bb..ff766d2145a 100644 --- a/src/webapp/web/admin/ping.jsp +++ b/src/webapp/web/admin/ping.jsp @@ -24,15 +24,7 @@ <%@ page import="org.apache.solr.request.ServletSolrParams"%> <%@ page import="org.apache.solr.request.SolrQueryRequest"%> -<% - SolrCore core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore"); - if (core == null) { - String coreParam = request.getParameter("core"); - core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam) : null; - } - if (core == null) - core = SolrCore.getSolrCore(); -%> +<%@include file="_info.jsp" %> diff --git a/src/webapp/web/admin/raw-schema.jsp b/src/webapp/web/admin/raw-schema.jsp index 1a1edc6c5f6..bf612a9816e 100644 --- a/src/webapp/web/admin/raw-schema.jsp +++ b/src/webapp/web/admin/raw-schema.jsp @@ -20,6 +20,7 @@ <%@ page import="java.io.Reader"%> <%@ page import="java.util.logging.Logger"%> <%@ page contentType="text/plain;charset=UTF-8" language="java" %> +<%@include file="_info.jsp" %> <%! static Logger log = Logger.getLogger(SolrCore.class.getName()); %> @@ -27,15 +28,6 @@ // NOTE -- this file will be removed in a future release log.warning("Using deprecated JSP: " + request.getRequestURL().append("?").append(request.getQueryString()) + " -- check the ShowFileRequestHandler" ); - SolrCore core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore"); - if (core == null) { - String coreParam = request.getParameter("core"); - core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam) : null; - } - if (core == null) - core = SolrCore.getSolrCore(); - - IndexSchema schema = core.getSchema(); Reader input = new InputStreamReader(schema.getInputStream()); char[] buf = new char[4096]; while (true) {