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

SOLR-3244: Fix new admin UI for Tomcat 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1300710 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-03-14 20:29:42 +00:00
parent dba31ba5a5
commit 8bcbd04454
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -439,7 +439,8 @@ Other Changes
* SOLR-2607: Removed obsolete client/ folder (ehatcher, Eric Pugh, janhoy) * SOLR-2607: Removed obsolete client/ folder (ehatcher, Eric Pugh, janhoy)
* SOLR-3202: Dropping Support for JSP. New Admin UI is all client side (ryan) * SOLR-3202, SOLR-3244: Dropping Support for JSP. New Admin UI is all client side
(ryan, Aliaksandr Zhuhrou, Uwe Schindler)
* SOLR-3159: Upgrade example and tests to run with Jetty 8 (ryan) * SOLR-3159: Upgrade example and tests to run with Jetty 8 (ryan)

43
solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
View File

@ -17,8 +17,7 @@
package org.apache.solr.servlet; package org.apache.solr.servlet;
import java.io.File; import java.io.InputStream;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
@ -29,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.solr.core.CoreContainer; import org.apache.solr.core.CoreContainer;
@ -47,25 +47,28 @@ public final class LoadAdminUiServlet extends HttpServlet {
response.setContentType("text/html"); response.setContentType("text/html");
PrintWriter out = response.getWriter(); PrintWriter out = response.getWriter();
File f = new File(getServletContext().getRealPath("admin.html")); InputStream in = getServletContext().getResourceAsStream("/admin.html");
if(f.exists()) { if(in != null) {
// This attribute is set by the SolrDispatchFilter try {
CoreContainer cores = (CoreContainer) request.getAttribute("org.apache.solr.CoreContainer"); // This attribute is set by the SolrDispatchFilter
CoreContainer cores = (CoreContainer) request.getAttribute("org.apache.solr.CoreContainer");
String html = IOUtils.toString(new FileInputStream(f), "UTF-8"); String html = IOUtils.toString(in, "UTF-8");
String[] search = new String[] { String[] search = new String[] {
"${contextPath}", "${contextPath}",
"${adminPath}" "${adminPath}"
}; };
String[] replace = new String[] { String[] replace = new String[] {
request.getContextPath(), StringEscapeUtils.escapeJavaScript(request.getContextPath()),
cores.getAdminPath() StringEscapeUtils.escapeJavaScript(cores.getAdminPath())
}; };
out.println( StringUtils.replaceEach(html, search, replace) ); out.println( StringUtils.replaceEach(html, search, replace) );
} } finally {
else { IOUtils.closeQuietly(in);
}
} else {
out.println("solr"); out.println("solr");
} }
} }