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

SOLR-350: fix JSPs broken by previous patch 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@635917 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2008-03-11 13:26:55 +00:00
parent 0d633bdcea
commit d5620505bf
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/webapp/resources/admin/index.jsp
View File

@ -47,7 +47,7 @@
</tr>
<%-- List the cores (that arent this one) so we can switch --%>
<% java.util.Collection<SolrCore> cores = org.apache.solr.core.MultiCore.getRegistry().getCores();
<% java.util.Collection<SolrCore> cores = org.apache.solr.core.SolrMultiCore.getInstance().getCores();
if (cores.size() > 1) {%><tr><td><strong>Cores:</strong><br></td><td><%
java.util.Iterator<SolrCore> icore = cores.iterator();
while (icore.hasNext()) {

2
src/webapp/resources/admin/logging.jsp
View File

@ -31,7 +31,7 @@
SolrCore core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
if (core == null) {
String coreParam = request.getParameter("core");
core = coreParam != null? org.apache.solr.core.MultiCore.getRegistry().getCore(coreParam) : null;
core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam) : null;
}
if (core == null)
core = SolrCore.getSolrCore();

2
src/webapp/resources/admin/ping.jsp
View File

@ -28,7 +28,7 @@
SolrCore core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
if (core == null) {
String coreParam = request.getParameter("core");
core = coreParam != null? org.apache.solr.core.MultiCore.getRegistry().getCore(coreParam) : null;
core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam) : null;
}
if (core == null)
core = SolrCore.getSolrCore();

2
src/webapp/resources/admin/raw-schema.jsp
View File

@ -30,7 +30,7 @@
SolrCore core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
if (core == null) {
String coreParam = request.getParameter("core");
core = coreParam != null? org.apache.solr.core.MultiCore.getRegistry().getCore(coreParam) : null;
core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam) : null;
}
if (core == null)
core = SolrCore.getSolrCore();

2
src/webapp/resources/admin/threaddump.jsp
View File

@ -27,7 +27,7 @@
SolrCore core = (SolrCore) request.getAttribute("org.apache.solr.SolrCore");
if (core == null) {
String coreParam = request.getParameter("core");
core = coreParam != null? org.apache.solr.core.MultiCore.getRegistry().getCore(coreParam) : null;
core = coreParam != null? org.apache.solr.core.SolrMultiCore.getInstance().getCore(coreParam) : null;
}
if (core == null)
core = SolrCore.getSolrCore();

2
src/webapp/resources/index.jsp
View File

@ -28,7 +28,7 @@
<a href="."><img border="0" align="right" height="61" width="142" src="admin/solr-head.gif" alt="Solr"/></a>
<%
org.apache.solr.core.MultiCore multicore = org.apache.solr.core.MultiCore.getRegistry();
org.apache.solr.core.MultiCore multicore = org.apache.solr.core.SolrMultiCore.getInstance();
if( multicore.isEnabled() ) {
for( org.apache.solr.core.SolrCore core : multicore.getCores() ) {%>
<a href="<%= core.getName() %>/admin/">Admin <%= core.getName() %> </a><br/>