juergen 02/04/30 01:47:10
Modified: src/webdav/server/org/apache/slide/webdav/method
GetMethod.java
Log:
Added support for Label header.
(ralf)
Revision Changes Path
1.25 +21 -5
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- GetMethod.java 25 Apr 2002 21:12:25 -0000 1.24
+++ GetMethod.java 30 Apr 2002 08:47:10 -0000 1.25
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
1.24 2002/04/25 21:12:25 jericho Exp $
- * $Revision: 1.24 $
- * $Date: 2002/04/25 21:12:25 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
1.25 2002/04/30 08:47:10 juergen Exp $
+ * $Revision: 1.25 $
+ * $Date: 2002/04/30 08:47:10 $
*
* ====================================================================
*
@@ -89,6 +89,7 @@
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.VersioningHelper;
+import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.util.Configuration;
/**
@@ -138,6 +139,11 @@
*/
protected boolean printContent = true;
+ /**
+ * The VersioningHelper used by this instance.
+ */
+ protected VersioningHelper vHelp = null;
+
// ----------------------------------------------------- Instance Variables
@@ -161,6 +167,8 @@
public GetMethod(NamespaceAccessToken token, HttpServletRequest req,
HttpServletResponse resp, WebdavServletConfig config) {
super(token, req, resp, config);
+ vHelp = VersioningHelper.getVersioningHelper(
+ slideToken, token, req, resp, getConfig() );
}
@@ -176,6 +184,16 @@
if (resourcePath == null) {
resourcePath = "/";
}
+ if (Configuration.useVersionControl()) {
+ try {
+ resourcePath = vHelp.getLabeledResourceUri(resourcePath,
+
req.getHeader(DeltavConstants.H_LABEL));
+ }
+ catch (SlideException e) {
+ throw new WebdavException(getErrorCode((Exception)e));
+ }
+ }
+
try{
retrieveRequestContent();
}
@@ -211,8 +229,6 @@
// NodeRevisionDescriptors revisionDescriptors =
// content.retrieve(slideToken, resourcePath);
NodeRevisionDescriptors revisionDescriptors;
- VersioningHelper vHelp = VersioningHelper.getVersioningHelper(
- slideToken, token, req, resp, getConfig() );
if( !Configuration.useVersionControl() ) {
revisionDescriptors =
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
