Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix JSPs that refered to removed SolrMultiCore 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@641115 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Erik Hatcher 2008-03-26 02:22:51 +00:00
parent d273c9a727
commit 493608377f
4 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/webapp/web/admin/_info.jsp
View File

@ -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");

9
src/webapp/web/admin/logging.jsp
View File

@ -26,16 +26,9 @@
<%@ page import="java.util.logging.Logger"%>
<?xml-stylesheet type="text/xsl" href="logging.xsl"?>
<%@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) {

10
src/webapp/web/admin/ping.jsp
View File

@ -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" %>
<?xml-stylesheet type="text/xsl" href="ping.xsl"?>
<solr>

10
src/webapp/web/admin/raw-schema.jsp
View File

@ -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) {