ozeigermann 2004/04/01 05:46:40
Modified: src/webdav/server/org/apache/slide/webdav/method Tag:
SLIDE_2_0_RELEASE_BRANCH AbstractWebdavMethod.java
. Tag: SLIDE_2_0_RELEASE_BRANCH RELEASE-NOTES-2.0-RC1
src/webdav/server/org/apache/slide/webdav/filter Tag:
SLIDE_2_0_RELEASE_BRANCH LogFilter.java
src/webdav/server/org/apache/slide/webdav/util Tag:
SLIDE_2_0_RELEASE_BRANCH PropertyRetrieverImpl.java
src/webdav/server/org/apache/slide/webdav Tag:
SLIDE_2_0_RELEASE_BRANCH WebdavServlet.java
Log:
Applied patch for bug #28079
Revision Changes Path
No revision
No revision
1.20.2.3 +6 -10
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.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- AbstractWebdavMethod.java 23 Mar 2004 13:32:08 -0000 1.20.2.2
+++ AbstractWebdavMethod.java 1 Apr 2004 13:46:39 -0000 1.20.2.3
@@ -370,15 +370,11 @@
/**
- * Return an absolute URL (absolute in the HTTP sense) based on a Slide
+ * Return an absolute path (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());
}
No revision
No revision
1.1.2.3 +4 -5 jakarta-slide/Attic/RELEASE-NOTES-2.0-RC1
Index: RELEASE-NOTES-2.0-RC1
===================================================================
RCS file: /home/cvs/jakarta-slide/Attic/RELEASE-NOTES-2.0-RC1,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RELEASE-NOTES-2.0-RC1 31 Mar 2004 14:56:20 -0000 1.1.2.2
+++ RELEASE-NOTES-2.0-RC1 1 Apr 2004 13:46:39 -0000 1.1.2.3
@@ -39,6 +39,8 @@
- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27340
- http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]&msgNo=10567
- http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]&msgNo=10794
+- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28073
+- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28079
Client:
- http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]&msgNo=10408
@@ -51,6 +53,7 @@
- Default URL encoding now is UTF-8 instead of platform default
- Bundled versions now use Tomcat 5.0.19 (instead of 5.0.16) and 4.1.30 (instead of
4.1.29)
- Added database schemata to the bundled and binary distributions
+- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27711
KNOWN ISSUES
------------
@@ -62,14 +65,10 @@
- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26784
- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27675
-WebDAV Layer:
-- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28073
-- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=28079
-
Client:
- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27952
- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27942
Misc:
- Documentation needs to be extended
-- http://nagoya.apache.org/bugzilla/show_bug.cgi?id=27711
+
No revision
No revision
1.6.2.2 +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.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- LogFilter.java 5 Feb 2004 16:11:22 -0000 1.6.2.1
+++ LogFilter.java 1 Apr 2004 13:46:39 -0000 1.6.2.2
@@ -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,
No revision
No revision
1.31.2.3 +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.31.2.2
retrieving revision 1.31.2.3
diff -u -r1.31.2.2 -r1.31.2.3
--- PropertyRetrieverImpl.java 14 Mar 2004 18:14:56 -0000 1.31.2.2
+++ PropertyRetrieverImpl.java 1 Apr 2004 13:46:39 -0000 1.31.2.3
@@ -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();
No revision
No revision
1.54.2.3 +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.54.2.2
retrieving revision 1.54.2.3
diff -u -r1.54.2.2 -r1.54.2.3
--- WebdavServlet.java 29 Mar 2004 14:45:51 -0000 1.54.2.2
+++ WebdavServlet.java 1 Apr 2004 13:46:39 -0000 1.54.2.3
@@ -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]
