cmlenz 02/03/02 08:33:22
Modified: src/webdav/server/org/apache/slide/webdav/method Tag:
SLIDE_1_0 LockMethod.java
Log:
Porting bugfixes/enhancements from the HEAD branch:
- Committed by juergen, 01/12/07 05:50:56
"1) BUG: PropPatch did not rollback, if one action could not be executed
2) The property itself decides, if it is read-only or can be modified by
propPatch
3) all live properties have get/set methods, they are now used."
- Committed by juergen, 02/01/21 10:24:58
"encode the owner URL, if it contains reserved or I18N characters."
- Commited by juergen, 02/02/21 10:38:15
"removed some redundant comments"
- Committed by juergen, 02/02/01 07:26:13
"infinity is spelled with a small 'i' (as stated in the DTD, in contrast
to the as wrong seen examples)"
- Committed by juergen, 02/01/28 06:29:17
"the timeout header is Infinite instaed of Infinity"
Revision Changes Path
No revision
No revision
1.23.2.1 +7 -12
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- LockMethod.java 6 Nov 2001 19:40:55 -0000 1.23
+++ LockMethod.java 2 Mar 2002 16:33:22 -0000 1.23.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.23 2001/11/06 19:40:55 remm Exp $
- * $Revision: 1.23 $
- * $Date: 2001/11/06 19:40:55 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.23.2.1 2002/03/02 16:33:22 cmlenz Exp $
+ * $Revision: 1.23.2.1 $
+ * $Date: 2002/03/02 16:33:22 $
*
* ====================================================================
*
@@ -238,7 +238,7 @@
lockDuration = MAX_TIMEOUT;
}
} else {
- if (lockDurationStr.equalsIgnoreCase("infinity")) {
+ if (lockDurationStr.equalsIgnoreCase("Infinite")) {
lockDuration = MAX_TIMEOUT;
} else {
try {
@@ -447,12 +447,8 @@
NodeRevisionDescriptor revisionDescriptor =
new NodeRevisionDescriptor(0);
- NodeProperty property = null;
-
// Resource type
- property = new NodeProperty("resourcetype",
- "<lock-null/>", true);
- revisionDescriptor.setProperty(property);
+ revisionDescriptor.setResourceType("<lock-null/>");
// Creating the revision descriptor
content.create(slideToken, lockInfo_lockSubject,
@@ -675,15 +671,14 @@
generatedXML.writeElement("d", null, "depth", XMLPrinter.OPENING);
if (token.isInheritable()) {
- generatedXML.writeText("Infinity");
+ generatedXML.writeText("infinity");
} else {
generatedXML.writeText("0");
}
generatedXML.writeElement("d", null, "depth", XMLPrinter.CLOSING);
generatedXML.writeElement("d", null, "owner", XMLPrinter.OPENING);
- //generatedXML.writeText(lockInfo_lockOwner);
- generatedXML.writeText(req.getServletPath() + token.getSubjectUri());
+ generatedXML.writeText(getFullPath(token.getSubjectUri()));
generatedXML.writeElement("d", null, "owner", XMLPrinter.CLOSING);
generatedXML.writeElement("d", null, "timeout", XMLPrinter.OPENING);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
