Author: markt
Date: Fri Jan 10 15:10:57 2014
New Revision: 1557148
URL: http://svn.apache.org/r1557148
Log:
Ensure directory name is displayed as part of directory listings
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1557148&r1=1557147&r2=1557148&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Fri Jan
10 15:10:57 2014
@@ -1340,8 +1340,6 @@ public class DefaultServlet
protected InputStream renderHtml(String contextPath, WebResource resource)
throws IOException {
- String name = resource.getName();
-
// Prepare a writer to a buffered area
ByteArrayOutputStream stream = new ByteArrayOutputStream();
OutputStreamWriter osWriter = new OutputStreamWriter(stream, "UTF8");
@@ -1359,7 +1357,7 @@ public class DefaultServlet
sb.append("<html>\r\n");
sb.append("<head>\r\n");
sb.append("<title>");
- sb.append(sm.getString("directory.title", name));
+ sb.append(sm.getString("directory.title", directoryWebappPath));
sb.append("</title>\r\n");
sb.append("<STYLE><!--");
sb.append(org.apache.catalina.util.TomcatCSS.TOMCAT_CSS);
@@ -1367,17 +1365,17 @@ public class DefaultServlet
sb.append("</head>\r\n");
sb.append("<body>");
sb.append("<h1>");
- sb.append(sm.getString("directory.title", name));
+ sb.append(sm.getString("directory.title", directoryWebappPath));
// Render the link to our parent (if required)
- String parentDirectory = name;
+ String parentDirectory = directoryWebappPath;
if (parentDirectory.endsWith("/")) {
parentDirectory =
parentDirectory.substring(0, parentDirectory.length() - 1);
}
int slash = parentDirectory.lastIndexOf('/');
if (slash >= 0) {
- String parent = name.substring(0, slash);
+ String parent = directoryWebappPath.substring(0, slash);
sb.append(" - <a href=\"");
sb.append(rewrittenContextPath);
if (parent.equals(""))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
