ozeigermann 2004/04/01 05:24:17
Modified: src/webdav/server/org/apache/slide/webdav/util Tag:
SLIDE_2_0_RELEASE_BRANCH
DirectoryIndexGenerator.java
Log:
Applied patch for bug #28073
Revision Changes Path
No revision
No revision
1.4.2.2 +6 -10
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java
Index: DirectoryIndexGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DirectoryIndexGenerator.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- DirectoryIndexGenerator.java 5 Feb 2004 16:11:25 -0000 1.4.2.1
+++ DirectoryIndexGenerator.java 1 Apr 2004 13:24:17 -0000 1.4.2.2
@@ -147,10 +147,6 @@
res.setContentType("text/html; charset=\"UTF-8\"");
- String contextPath = req.getContextPath();
- if (contextPath == null)
- contextPath = "";
-
// get the helpers
Content content = nat.getContentHelper();
Lock lock = nat.getLockHelper();
@@ -206,7 +202,7 @@
parentDirectory = parentDirectory.substring(0,
parentDirectory.lastIndexOf("/"));
writer.print("<tr><td colspan=\"5\" bgcolor=\"#ffffff\">\r\n");
writer.print("<a href=\"");
- writer.print(WebdavUtils.encodeURL(contextPath, "UTF-8"));
+ writer.print(WebdavUtils.getAbsolutePath("", req, config));
if (parentDirectory.equals(""))
parentDirectory = "/";
writer.print(parentDirectory); // I18N chars
@@ -305,7 +301,7 @@
writer.print("<td align=\"left\" colspan=\"3\"> \r\n");
writer.print("<a href=\"");
- writer.print(WebdavUtils.encodeURL(contextPath +
currentResource.substring(scope.length())));
+ writer.print(WebdavUtils.getAbsolutePath(currentResource, req, config));
writer.print("\"><tt>");
writer.print(stringToCharacterRef(trimmed)); // I18N chars
if (WebdavUtils.isCollection(currentDescriptor)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
