pnever 2002/09/20 08:19:50
Modified: src/webdav/server/org/apache/slide/webdav/util
UriHandler.java
Log:
Fixed getAssociatedWorkspaceUri() and isRestrictedUri() to allow COPY
with destination URI being an existing WS
Revision Changes Path
1.22 +10 -7
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java
Index: UriHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/UriHandler.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- UriHandler.java 12 Aug 2002 16:04:21 -0000 1.21
+++ UriHandler.java 20 Sep 2002 15:19:50 -0000 1.22
@@ -547,11 +547,12 @@
/**
* Returns the associated workspace URI if this URI represents a resource
- * in a workspace
- * @return the associated workspace URI; null, if the resource is not in a
workspace
+ * in a workspace; if the resource is a workspace itself, its own URI is
returned.
+ * @return the associated workspace URI; null, if the resource is neither a
workspace itself
+ * nor contained in a workspace
*/
public String getAssociatedWorkspaceUri() {
- if( !isResourceInWorkspaceUri() )
+ if( !isWorkspaceUri() && !isResourceInWorkspaceUri() )
return null;
UriHandler wspathHandler = WorkspacePathHandler.getWorkspacePathHandler();
@@ -661,7 +662,9 @@
isHistoryUri() ||
isHistoryPathUri() ||
isWorkspaceUri() ||
- isWorkspacePathUri();
+ isWorkspacePathUri() ||
+ isWorkingresourceUri() ||
+ isWorkingresourcePathUri();
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
