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 2012/03/14 21:29:42 UTC
svn commit: r1300710 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
Author: uschindler
Date: Wed Mar 14 20:29:42 2012
New Revision: 1300710
URL: http://svn.apache.org/viewvc?rev=1300710&view=rev
Log:
SOLR-3244: Fix new admin UI for Tomcat
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1300710&r1=1300709&r2=1300710&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Mar 14 20:29:42 2012
@@ -439,7 +439,8 @@ Other Changes
* 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)
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java?rev=1300710&r1=1300709&r2=1300710&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java Wed Mar 14 20:29:42 2012
@@ -17,8 +17,7 @@
package org.apache.solr.servlet;
-import java.io.File;
-import java.io.FileInputStream;
+import java.io.InputStream;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,6 +28,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.solr.core.CoreContainer;
@@ -47,25 +47,28 @@ public final class LoadAdminUiServlet ex
response.setContentType("text/html");
PrintWriter out = response.getWriter();
- File f = new File(getServletContext().getRealPath("admin.html"));
- if(f.exists()) {
- // 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[] search = new String[] {
- "${contextPath}",
- "${adminPath}"
- };
- String[] replace = new String[] {
- request.getContextPath(),
- cores.getAdminPath()
- };
-
- out.println( StringUtils.replaceEach(html, search, replace) );
- }
- else {
+ InputStream in = getServletContext().getResourceAsStream("/admin.html");
+ if(in != null) {
+ try {
+ // This attribute is set by the SolrDispatchFilter
+ CoreContainer cores = (CoreContainer) request.getAttribute("org.apache.solr.CoreContainer");
+
+ String html = IOUtils.toString(in, "UTF-8");
+
+ String[] search = new String[] {
+ "${contextPath}",
+ "${adminPath}"
+ };
+ String[] replace = new String[] {
+ StringEscapeUtils.escapeJavaScript(request.getContextPath()),
+ StringEscapeUtils.escapeJavaScript(cores.getAdminPath())
+ };
+
+ out.println( StringUtils.replaceEach(html, search, replace) );
+ } finally {
+ IOUtils.closeQuietly(in);
+ }
+ } else {
out.println("solr");
}
}