juergen 01/09/13 01:14:07
Modified: src/webdav/server/org/apache/slide/webdav WebdavServlet.java
src/share/org/apache/slide/macro MacroImpl.java
src/webdav/server/org/apache/slide/webdav/method
LockMethod.java
src/share/org/apache/slide/lock LockImpl.java
Log:
call enumLocks(..., false). see separate e-mail. PropFind is still with implicit
true.
Revision Changes Path
1.28 +8 -8
jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- WebdavServlet.java 2001/09/08 20:05:11 1.27
+++ WebdavServlet.java 2001/09/13 08:14:07 1.28
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
1.27 2001/09/08 20:05:11 remm Exp $
- * $Revision: 1.27 $
- * $Date: 2001/09/08 20:05:11 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
1.28 2001/09/13 08:14:07 juergen Exp $
+ * $Revision: 1.28 $
+ * $Date: 2001/09/13 08:14:07 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author Dirk Verbeeck
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
*/
public class WebdavServlet extends HttpServlet {
@@ -132,7 +132,7 @@
new SimpleDateFormat(DATE_FORMAT);
- public static final String ATTRIBUTE_NAME =
+ public static final String ATTRIBUTE_NAME =
"org.apache.slide.NamespaceAccessToken";
@@ -349,7 +349,7 @@
// FIXME
// Lookup for the NAT using the servlet context
- token = (NamespaceAccessToken)
+ token = (NamespaceAccessToken)
getServletContext().getAttribute(ATTRIBUTE_NAME);
if (token != null)
return;
@@ -536,7 +536,7 @@
permissionsList =
security.enumeratePermissions(slideToken, object.getUri());
- locksList = lock.enumerateLocks(slideToken, object.getUri());
+ locksList = lock.enumerateLocks(slideToken, object.getUri(), false);
} catch (SlideException e) {
@@ -609,7 +609,7 @@
permissionsList =
security.enumeratePermissions(slideToken, currentResource);
- locksList = lock.enumerateLocks(slideToken, currentResource);
+ locksList = lock.enumerateLocks(slideToken, currentResource, false);
} catch (SlideException e) {
1.21 +5 -5 jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MacroImpl.java 2001/09/01 15:08:17 1.20
+++ MacroImpl.java 2001/09/13 08:14:07 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.20
2001/09/01 15:08:17 juergen Exp $
- * $Revision: 1.20 $
- * $Date: 2001/09/01 15:08:17 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.21
2001/09/13 08:14:07 juergen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/09/13 08:14:07 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Macro helper class.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public final class MacroImpl implements Macro {
@@ -446,7 +446,7 @@
if (!revisionDescriptors.isVersioned()) {
// remove the associated locks
Enumeration locks = lockHelper.enumerateLocks
- (token, currentObject.getUri());
+ (token, currentObject.getUri(), false);
while (locks.hasMoreElements()) {
lockHelper.unlock(token, (NodeLock) locks.nextElement());
}
1.21 +4 -4
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LockMethod.java 2001/09/10 07:16:17 1.20
+++ LockMethod.java 2001/09/13 08:14:07 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.20 2001/09/10 07:16:17 juergen Exp $
- * $Revision: 1.20 $
- * $Date: 2001/09/10 07:16:17 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.21 2001/09/13 08:14:07 juergen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/09/13 08:14:07 $
*
* ====================================================================
*
@@ -584,7 +584,7 @@
try {
Enumeration lockTokens =
- lock.enumerateLocks(slideToken, lockInfo_lockSubject);
+ lock.enumerateLocks(slideToken, lockInfo_lockSubject, false);
NodeLock currentLockToken = null;
Date newExpirationDate =
1.21 +7 -6 jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java
Index: LockImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LockImpl.java 2001/09/10 11:37:22 1.20
+++ LockImpl.java 2001/09/13 08:14:07 1.21
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v
1.20 2001/09/10 11:37:22 juergen Exp $
- * $Revision: 1.20 $
- * $Date: 2001/09/10 11:37:22 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v
1.21 2001/09/13 08:14:07 juergen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/09/13 08:14:07 $
*
* ====================================================================
*
@@ -78,7 +78,7 @@
* Lock helper class.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
*/
public final class LockImpl implements Lock {
@@ -213,7 +213,7 @@
throws ServiceAccessException, LockTokenNotFoundException,
ObjectNotFoundException {
- Enumeration locksList = enumerateLocks(slideToken, objectUri);
+ Enumeration locksList = enumerateLocks(slideToken, objectUri, false);
while (locksList.hasMoreElements()) {
NodeLock currentLock = (NodeLock) locksList.nextElement();
if (currentLock.getLockId().equals(lockId)) {
@@ -260,7 +260,7 @@
throws ServiceAccessException, LockTokenNotFoundException,
ObjectNotFoundException {
- Enumeration locksList = enumerateLocks(slideToken, objectUri);
+ Enumeration locksList = enumerateLocks(slideToken, objectUri, false);
while (locksList.hasMoreElements()) {
NodeLock currentLock = (NodeLock) locksList.nextElement();
if (currentLock.getLockId().equals(lockId)) {
@@ -668,4 +668,5 @@
}
}
+
