pnever 2002/08/12 09:04:21
Modified: src/webdav/server/org/apache/slide/webdav/util
UriHandler.java VersioningHelper.java
WorkingresourcePathHandler.java
Log:
Made parameterized WR path work
Revision Changes Path
1.21 +6 -6
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- UriHandler.java 17 Jul 2002 12:24:51 -0000 1.20
+++ UriHandler.java 12 Aug 2002 16:04:21 -0000 1.21
@@ -192,10 +192,10 @@
* Generates the next available workingresource URI and returns an URI handler
for it.
* @param sToken the Slide token
* @param nsaToken the namespace access token
- * @param uh the URI handler of the resource being checked-out ** TODO **
+ * @param uh the URI handler of the version resource being checked-out
*/
public static UriHandler
- createNextWorkingresourceUri( SlideToken sToken, NamespaceAccessToken nsaToken )
+ createNextWorkingresourceUri( SlideToken sToken, NamespaceAccessToken nsaToken,
UriHandler uh )
throws ObjectNotFoundException, AccessDeniedException, ObjectLockedException,
LinkedObjectNotFoundException, ServiceAccessException,
RevisionDescriptorNotFoundException, RevisionNotFoundException {
@@ -203,7 +203,7 @@
UriHandler result = null;
String nsName = nsaToken.getName();
UriHandler wrpathHandler =
- WorkingresourcePathHandler.getWorkingresourcePathHandler();
+ WorkingresourcePathHandler.getResolvedWorkingresourcePathHandler(
nsName, uh );
Content content = nsaToken.getContentHelper();
String wrpath = wrpathHandler.toString();
1.72 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- VersioningHelper.java 8 Aug 2002 08:31:25 -0000 1.71
+++ VersioningHelper.java 12 Aug 2002 16:04:21 -0000 1.72
@@ -856,7 +856,7 @@
NodeRevisionDescriptors vhrNrds = content.retrieve(sToken, vhUri);
// create the workingresource
- UriHandler wrUh = UriHandler.createNextWorkingresourceUri( sToken,
nsaToken );
+ UriHandler wrUh = UriHandler.createNextWorkingresourceUri( sToken,
nsaToken, rUh );
String wrUri = String.valueOf( wrUh );
SubjectNode wrNode = new SubjectNode();
structure.create( sToken, wrNode, String.valueOf(wrUh) );
1.9 +8 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java
Index: WorkingresourcePathHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WorkingresourcePathHandler.java 17 Jul 2002 12:24:51 -0000 1.8
+++ WorkingresourcePathHandler.java 12 Aug 2002 16:04:21 -0000 1.9
@@ -78,7 +78,6 @@
static boolean parameterized =
(WORKINGRESOURCE_PATH.indexOf(I_STORE_PLACE_HOLDER_IN_PATH) >= 0);
-
/**
* Factory method.
*/
@@ -88,9 +87,14 @@
/**
* Get a resolved UriHandler for this WorkingresourcePathHandler.
+ * @param namespaceName the namespace name
+ * @param uh an URI required to determine the associated base store;
+ * usually the URI of the version resource being checked out.
*/
public static UriHandler getResolvedWorkingresourcePathHandler( String
namespaceName, UriHandler uh ) {
if( parameterized ) {
+ // requires URI to determine associated base store; usually URI of
version being checked-out.
+ // NOTE: if the workingresource path is parameterized but the history
path is not ... we have trouble :-(
return getResolvedWorkingresourcePathHandler(
uh.getAssociatedBaseStoreName(namespaceName) );
}
else
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
