juergen 02/04/15 05:58:26
Modified: src/webdav/server/org/apache/slide/webdav/method
MoveMethod.java
Log:
Use VersioningHelper.setWorkspace() instead of retrieving the parent ObjectNode's
<workspace> property.
(ralf)
Revision Changes Path
1.27 +4 -20
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- MoveMethod.java 15 Apr 2002 11:02:36 -0000 1.26
+++ MoveMethod.java 15 Apr 2002 12:58:26 -0000 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.26 2002/04/15 11:02:36 juergen Exp $
- * $Revision: 1.26 $
- * $Date: 2002/04/15 11:02:36 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
1.27 2002/04/15 12:58:26 juergen Exp $
+ * $Revision: 1.27 $
+ * $Date: 2002/04/15 12:58:26 $
*
* ====================================================================
*
@@ -390,23 +390,7 @@
}
else {
// DAV:workspace-member-moved
- NodeProperty workspaceProperty = null;
- ObjectNode object = structure.retrieve(slideToken, resourceUri);
- try {
- ObjectNode parent = structure.getParent(slideToken, object);
- NodeRevisionDescriptors parentDescriptors =
- versioningHelper.retrieveRevisionDescriptors(parent.getUri());
- NodeRevisionDescriptor parentDescriptor =
-
versioningHelper.retrieveLatestRevisionDescriptor(parent.getUri(), parentDescriptors);
- workspaceProperty = parentDescriptor.getProperty(P_WORKSPACE);
- }
- catch (SlideException e) {}
- if (workspaceProperty != null) {
- revisionDescriptor.setProperty(workspaceProperty);
- }
- else {
- revisionDescriptor.removeProperty(P_WORKSPACE);
- }
+ versioningHelper.setWorkspaceProperty(resourceUri,
revisionDescriptor);
}
content.store(slideToken, resourceUri, revisionDescriptor, null);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>