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:45:59 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method GetMethod.java
pnever 02/03/01 08:45:59
Modified: src/webdav/server/org/apache/slide/webdav/method
GetMethod.java
Log:
Using versioning helper to retrieve descriptors
Revision Changes Path
1.19 +12 -26 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java
Index: GetMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- GetMethod.java 22 Feb 2002 17:29:03 -0000 1.18
+++ GetMethod.java 1 Mar 2002 16:45:59 -0000 1.19
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v 1.18 2002/02/22 17:29:03 pnever Exp $
- * $Revision: 1.18 $
- * $Date: 2002/02/22 17:29:03 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v 1.19 2002/03/01 16:45:59 pnever Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/03/01 16:45:59 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
import org.apache.slide.structure.Structure;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
-import org.apache.slide.webdav.util.UriHandler;
+import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.util.Configuration;
/**
@@ -191,20 +191,17 @@
// Changed for DeltaV --start--
// NodeRevisionDescriptors revisionDescriptors =
// content.retrieve(slideToken, resourcePath);
- NodeRevisionDescriptors revisionDescriptors = null;
- UriHandler uh = null;
+ NodeRevisionDescriptors revisionDescriptors;
+ VersioningHelper vHelp = VersioningHelper.getVersioningHelper(
+ slideToken, token, req, resp, getConfig() );
+
if( !Configuration.useVersionControl() ) {
revisionDescriptors =
content.retrieve(slideToken, resourcePath);
}
else {
- uh = UriHandler.getUriHandler( token, resourcePath );
- if( uh.isVersionUri() )
- revisionDescriptors =
- content.retrieve( slideToken, uh.getAssociatedHistoryUri() );
- else
revisionDescriptors =
- content.retrieve( slideToken, resourcePath );
+ vHelp.retrieveRevisionDescriptors( resourcePath );
}
// Changed for DeltaV --end--
@@ -214,25 +211,14 @@
// Changed for DeltaV --start--
// NodeRevisionDescriptor revisionDescriptor =
// content.retrieve(slideToken, revisionDescriptors);
- NodeRevisionDescriptor revisionDescriptor = null;
+ NodeRevisionDescriptor revisionDescriptor;
if( !Configuration.useVersionControl() ) {
revisionDescriptor =
content.retrieve(slideToken, revisionDescriptors);
}
else {
- if( uh.isHistoryUri() ) {
- resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
- return;
- }
- 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>