ozeigermann 2004/04/01 23:30:28
Modified: src/webdav/server/org/apache/slide/webdav/util
PropertyRetrieverImpl.java
src/webdav/server/org/apache/slide/webdav/filter
LogFilter.java
src/webdav/server/org/apache/slide/webdav/method
AbstractWebdavMethod.java
src/webdav/server/org/apache/slide/webdav WebdavServlet.java
Log:
Applied patch for bug #28079
Revision Changes Path
1.34 +7 -7
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java
Index: PropertyRetrieverImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- PropertyRetrieverImpl.java 1 Apr 2004 14:41:02 -0000 1.33
+++ PropertyRetrieverImpl.java 2 Apr 2004 07:30:27 -0000 1.34
@@ -578,9 +578,9 @@
if( propertyValue.toString().indexOf('<') >= 0 ) {
try {
XMLValue xmlValue = new XMLValue(propertyValue.toString(),
valueDefaultNamespace);
- if (AbstractResourceKind.isLiveProperty(propertyName)) {
- convertHrefValueToAbsoluteURL (xmlValue, contextPath,
servletPath, config);
- }
+// if (AbstractResourceKind.isLiveProperty(propertyName)) {
+// convertHrefValueToAbsoluteURL (xmlValue, contextPath,
servletPath, config);
+// }
Iterator iterator = xmlValue.iterator();
while (iterator.hasNext()) {
Object o = iterator.next();
1.8 +5 -8
jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/LogFilter.java
Index: LogFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/filter/LogFilter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LogFilter.java 11 Feb 2004 11:30:27 -0000 1.7
+++ LogFilter.java 2 Apr 2004 07:30:28 -0000 1.8
@@ -129,9 +129,6 @@
String datetime = df.format( new Date() );
String method = req.getMethod();
String uri = req.getRequestURI();
- String path = req.getServletPath();
- if( "".equals(path) )
- path = "/";
Principal p = req.getUserPrincipal();
String principal = (p != null ? p.getName() : "");
String contentlength = req.getHeader( "Content-Length" );
@@ -147,7 +144,7 @@
String detail = resp.getStatusText();
if( detail == null || "".equals(detail) )
detail = message;
-
+ String path = (String)req.getAttribute("slide_uri"); // set by
long end = System.currentTimeMillis();
logLine( (end-start), status, thread, method, datetime, uri, path,
contentlength, principal,
1.26 +5 -9
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java
Index: AbstractWebdavMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- AbstractWebdavMethod.java 23 Mar 2004 13:47:15 -0000 1.25
+++ AbstractWebdavMethod.java 2 Apr 2004 07:30:28 -0000 1.26
@@ -363,12 +363,8 @@
* Return an absolute URL (absolute in the HTTP sense) based on a Slide
* path.
*/
- public String getFullPath(String path) {
-
- if (path.startsWith("/"))
- return WebdavUtils.encodeURL(req.getContextPath() + path);
- else
- return WebdavUtils.encodeURL(req.getContextPath() + "/" + path);
+ public String getFullPath(String slidePath) {
+ return WebdavUtils.getAbsolutePath(slidePath, req, getConfig());
}
1.57 +6 -7
jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- WebdavServlet.java 29 Mar 2004 14:45:48 -0000 1.56
+++ WebdavServlet.java 2 Apr 2004 07:30:28 -0000 1.57
@@ -132,6 +132,8 @@
if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
token.getLogger().log("==> "+req.getMethod()+" start: "+sdf.format(new
Date(System.currentTimeMillis()))+" ["+Thread.currentThread().getName()+"]",
LOG_CHANNEL, Logger.DEBUG);
+ req.setAttribute("slide_uri", WebdavUtils.getRelativePath(req,
(WebdavServletConfig) getServletConfig()));
+
try {
if (token == null) {
@@ -337,9 +339,6 @@
token.getName());
// attributes for general use
req.setAttribute("slide_namespace", token.getName());
- req.setAttribute
- ("slide_uri", WebdavUtils.getRelativePath
- (req, (WebdavServletConfig)getServletConfig()));
directoryBrowsingTemplate.forward(req, res);
} else {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
