You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by pn...@apache.org on 2002/03/01 17:46:26 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method PropFindMethod.java
pnever 02/03/01 08:46:26
Modified: src/webdav/server/org/apache/slide/webdav/method
PropFindMethod.java
Log:
Using versioning helper to retrieve descriptors
Revision Changes Path
1.50 +12 -26 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- PropFindMethod.java 26 Feb 2002 08:06:19 -0000 1.49
+++ PropFindMethod.java 1 Mar 2002 16:46:26 -0000 1.50
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.49 2002/02/26 08:06:19 juergen Exp $
- * $Revision: 1.49 $
- * $Date: 2002/02/26 08:06:19 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.50 2002/03/01 16:46:26 pnever Exp $
+ * $Revision: 1.50 $
+ * $Date: 2002/03/01 16:46:26 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
import org.apache.slide.content.*;
import org.apache.slide.security.NodePermission;
import org.apache.slide.security.Security;
-import org.apache.slide.webdav.util.UriHandler;
+import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.slide.util.Configuration;
@@ -559,19 +559,17 @@
// Changed for DeltaV --start--
// revisionDescriptors =
// content.retrieve(slideToken, object.getUri());
- UriHandler uh = null;
+ VersioningHelper vHelp = VersioningHelper.getVersioningHelper(
+ slideToken, token, req, resp, getConfig() );
+ String resourcePath = object.getUri();
+
if( !Configuration.useVersionControl() ) {
revisionDescriptors =
- content.retrieve(slideToken, object.getUri());
+ content.retrieve(slideToken, resourcePath);
}
else {
- uh = UriHandler.getUriHandler( token, object.getUri() );
- if( uh.isVersionUri() )
- revisionDescriptors =
- content.retrieve( slideToken, uh.getAssociatedHistoryUri() );
- else
revisionDescriptors =
- content.retrieve(slideToken, object.getUri());
+ vHelp.retrieveRevisionDescriptors( resourcePath );
}
// Changed for DeltaV --end--
@@ -584,20 +582,8 @@
revisionDescriptors);
}
else {
- if( uh.isHistoryUri() ) {
- revisionDescriptor =
- content.retrieve( slideToken, revisionDescriptors,
- new NodeRevisionNumber(0, 0) );
- }
- else if( uh.isVersionUri() ) {
- revisionDescriptor =
- content.retrieve( slideToken, revisionDescriptors,
- new NodeRevisionNumber(uh.getVersionName()) );
- }
- else {
- revisionDescriptor =
- content.retrieve( slideToken, revisionDescriptors );
- }
+ revisionDescriptor = vHelp.retrieveLatestRevisionDescriptor(
+ resourcePath, revisionDescriptors );
}
// Changed for DeltaV --end--
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>