[Bedework-commit] webdav r235 - in releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet: common shared

[svnadmin at bedework.org]

Author: douglm
Date: 2010-09-07 00:31:31 -0400 (Tue, 07 Sep 2010)
New Revision: 235

Modified:
   releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/common/MethodBase.java
   releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsIntf.java
Log:
Make getRequestUri available to interfaces. Use it in MethodBase

Modified: releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/common/MethodBase.java
===================================================================
--- releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/common/MethodBase.java	2010-09-07 01:46:30 UTC (rev 234)
+++ releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/common/MethodBase.java	2010-09-07 04:31:31 UTC (rev 235)
@@ -173,20 +173,9 @@
       return resourceUri;
     }
 
-    String uri = req.getServletPath();
+    resourceUri = WebdavNsIntf.getResourceUri(req);
 
-    if ((uri == null) || (uri.length() == 0)) {
-      /* No path specified - set it to root. */
-      uri = "/";
-    }
-
     if (debug) {
-      trace("uri: " + uri);
-    }
-
-    resourceUri = WebdavNsIntf.fixPath(uri);
-
-    if (debug) {
       trace("resourceUri: " + resourceUri);
     }
 

Modified: releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsIntf.java
===================================================================
--- releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsIntf.java	2010-09-07 01:46:30 UTC (rev 234)
+++ releases/bedework-3.6/server/src/edu/rpi/cct/webdav/servlet/shared/WebdavNsIntf.java	2010-09-07 04:31:31 UTC (rev 235)
@@ -1026,6 +1026,24 @@
     }
   }
 
+  /** Get the decoded and fixed resource URI
+   *
+   * @param req      Servlet request object
+   * @return String  fixed up uri
+   * @throws WebdavException
+   */
+  public static String getResourceUri(final HttpServletRequest req)
+      throws WebdavException {
+    String uri = req.getServletPath();
+
+    if ((uri == null) || (uri.length() == 0)) {
+      /* No path specified - set it to root. */
+      uri = "/";
+    }
+
+    return fixPath(uri);
+  }
+
   /** Return a path, beginning with a "/", after "." and ".." are removed.
    * If the parameter path attempts to go above the root we return null.
    *