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 cm...@apache.org on 2002/03/02 17:42:08 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method OptionsMethod.java
cmlenz 02/03/02 08:42:08
Modified: src/webdav/server/org/apache/slide/webdav/method Tag:
SLIDE_1_0 OptionsMethod.java
Log:
Porting bugfixes/enhancements from the HEAD branch:
- Committed by juergen, 02/01/04 07:24:03
"acl is now delievered back."
Revision Changes Path
No revision
No revision
1.8.2.1 +6 -6 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- OptionsMethod.java 17 Aug 2001 14:39:12 -0000 1.8
+++ OptionsMethod.java 2 Mar 2002 16:42:08 -0000 1.8.2.1
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v 1.8 2001/08/17 14:39:12 cmlenz Exp $
- * $Revision: 1.8 $
- * $Date: 2001/08/17 14:39:12 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v 1.8.2.1 2002/03/02 16:42:08 cmlenz Exp $
+ * $Revision: 1.8.2.1 $
+ * $Date: 2002/03/02 16:42:08 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
}
protected void parseRequest()
- throws WebdavException {
+ throws WebdavException {
}
protected void executeRequest()
@@ -119,14 +119,14 @@
NodeRevisionDescriptor revisionDescriptor =
content.retrieve(slideToken, revisionDescriptors);
methodsAllowed = "OPTIONS, GET, HEAD, POST, DELETE, TRACE, "
- + "PROPFIND, PROPPATCH, COPY, MOVE, LOCK, UNLOCK";
+ + "PROPFIND, PROPPATCH, COPY, MOVE, LOCK, UNLOCK, ACL";
if (!WebdavUtils.isCollection(revisionDescriptor)) {
methodsAllowed = methodsAllowed + ", PUT";
}
} catch (SlideException e) {
if (resourceUri.equals("/")) {
methodsAllowed = "OPTIONS, GET, HEAD, POST, DELETE, TRACE, "
- + "PROPFIND, PROPPATCH, COPY, MOVE, LOCK, UNLOCK";
+ + "PROPFIND, PROPPATCH, COPY, MOVE, LOCK, UNLOCK, ACL";
} else {
methodsAllowed = "OPTIONS, MKCOL, PUT, LOCK";
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>