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 ju...@apache.org on 2001/05/16 14:07:03 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/store AbstractStore.java LockStore.java SecurityStore.java StandardStore.java
juergen 01/05/16 05:07:03
Modified: src/share/org/apache/slide/store AbstractStore.java
LockStore.java SecurityStore.java
StandardStore.java
Log:
removed the NRD from the API, to be put in NodePermission, see e-mails.
Revision Changes Path
1.15 +18 -27 jakarta-slide/src/share/org/apache/slide/store/AbstractStore.java
Index: AbstractStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/AbstractStore.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractStore.java 2001/05/10 18:32:47 1.14
+++ AbstractStore.java 2001/05/16 12:06:42 1.15
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/AbstractStore.java,v 1.14 2001/05/10 18:32:47 juergen Exp $
- * $Revision: 1.14 $
- * $Date: 2001/05/10 18:32:47 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/AbstractStore.java,v 1.15 2001/05/16 12:06:42 juergen Exp $
+ * $Revision: 1.15 $
+ * $Date: 2001/05/16 12:06:42 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* Abstract implementation of a store. Handles all caching operations.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public abstract class AbstractStore extends AbstractSimpleService
implements Store {
@@ -571,16 +571,15 @@
* Store an object permissions in the Descriptors Store.
*
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void grantPermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void grantPermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
NodePermission tempPermission = permission.cloneObject();
tempPermission.validate(uri.toString());
enlist(securityStore);
try {
- securityStore.grantPermission(uri, revisionDescriptor, tempPermission);
+ securityStore.grantPermission(uri, tempPermission);
} catch (ServiceAccessException e) {
delist(securityStore, false);
throw e;
@@ -593,15 +592,14 @@
* Store an object permissions in the Descriptors Store.
*
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void revokePermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void revokePermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
permission.validate(uri.toString());
enlist(securityStore);
try {
- securityStore.revokePermission(uri, revisionDescriptor, permission);
+ securityStore.revokePermission(uri, permission);
} catch (ServiceAccessException e) {
delist(securityStore, false);
throw e;
@@ -614,14 +612,13 @@
* Revoke all the permissions on the object.
*
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void revokePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public void revokePermissions(Uri uri)
throws ServiceAccessException {
enlist(securityStore);
try {
- securityStore.revokePermissions(uri, revisionDescriptor);
+ securityStore.revokePermissions(uri);
} catch (ServiceAccessException e) {
delist(securityStore, false);
throw e;
@@ -634,13 +631,12 @@
* Read an object permissions.
*
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public Enumeration enumeratePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumeratePermissions(Uri uri)
throws ServiceAccessException {
// TODO : The vectors elements MUST be cloned
- return securityStore.enumeratePermissions(uri, revisionDescriptor);
+ return securityStore.enumeratePermissions(uri);
}
@@ -648,15 +644,14 @@
* Puts a lock on a subject.
*
* @param lock Lock token
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
*/
- public void putLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void putLock(Uri uri, NodeLock lock)
throws ServiceAccessException {
lock.validate(uri.toString());
enlist(lockStore);
try {
- lockStore.putLock(uri, revisionDescriptor, lock);
+ lockStore.putLock(uri, lock);
} catch (ServiceAccessException e) {
delist(lockStore, false);
throw e;
@@ -669,16 +664,15 @@
* Renews a lock.
*
* @param lock Token to renew
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void renewLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void renewLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
lock.validate(uri.toString());
enlist(lockStore);
try {
- lockStore.renewLock(uri, revisionDescriptor, lock);
+ lockStore.renewLock(uri, lock);
} catch (ServiceAccessException e) {
delist(lockStore, false);
throw e;
@@ -694,16 +688,15 @@
* Removes (cancels) a lock.
*
* @param lock Token to remove
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void removeLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void removeLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
lock.validate(uri.toString());
enlist(lockStore);
try {
- lockStore.removeLock(uri, revisionDescriptor, lock);
+ lockStore.removeLock(uri, lock);
} catch (ServiceAccessException e) {
delist(lockStore, false);
throw e;
@@ -719,16 +712,15 @@
* Kills a lock.
*
* @param lock Token to remove
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void killLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void killLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
lock.validate(uri.toString());
enlist(lockStore);
try {
- lockStore.killLock(uri, revisionDescriptor, lock);
+ lockStore.killLock(uri, lock);
} catch (ServiceAccessException e) {
delist(lockStore, false);
throw e;
@@ -744,13 +736,12 @@
* Returns the list of locks put on a subject.
*
* @param subject Subject
- * @param revisionDescriptor Node revision descriptor
* @return Enumeration List of locks which have been put on the subject
* @exception ServiceAccessException Service access error
*/
- public Enumeration enumerateLocks(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumerateLocks(Uri uri)
throws ServiceAccessException {
- return lockStore.enumerateLocks(uri, revisionDescriptor);
+ return lockStore.enumerateLocks(uri);
}
1.4 +17 -22 jakarta-slide/src/share/org/apache/slide/store/LockStore.java
Index: LockStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/LockStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LockStore.java 2001/05/10 18:34:21 1.3
+++ LockStore.java 2001/05/16 12:06:45 1.4
@@ -1,13 +1,13 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/LockStore.java,v 1.3 2001/05/10 18:34:21 juergen Exp $
- * $Revision: 1.3 $
- * $Date: 2001/05/10 18:34:21 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/LockStore.java,v 1.4 2001/05/16 12:06:45 juergen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/05/16 12:06:45 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -23,15 +23,15 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
+ * from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
@@ -59,7 +59,7 @@
*
* [Additional notices, if required by prior licensing conditions]
*
- */
+ */
package org.apache.slide.store;
@@ -76,9 +76,9 @@
/**
* Store for Lock objects.
- *
+ *
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public interface LockStore extends Service {
@@ -88,60 +88,55 @@
/**
* Create a new lock.
- *
+ *
* @param lock Lock token
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
*/
- void putLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ void putLock(Uri uri, NodeLock lock)
throws ServiceAccessException;
/**
* Renew a lock.
- *
+ *
* @param lock Token to renew
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- void renewLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ void renewLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException;
/**
* Unlock.
- *
+ *
* @param lock Token to remove
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- void removeLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ void removeLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException;
/**
* Kill a lock.
- *
+ *
* @param lock Token to remove
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- void killLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ void killLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException;
/**
* Enumerate locks on an object.
- *
+ *
* @param subject Subject
- * @param revisionDescriptor Node revision descriptor
* @return Enumeration List of locks which have been put on the subject
* @exception ServiceAccessException Service access error
*/
- Enumeration enumerateLocks(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ Enumeration enumerateLocks(Uri uri)
throws ServiceAccessException;
1.4 +15 -19 jakarta-slide/src/share/org/apache/slide/store/SecurityStore.java
Index: SecurityStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/SecurityStore.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SecurityStore.java 2001/05/10 18:36:47 1.3
+++ SecurityStore.java 2001/05/16 12:06:48 1.4
@@ -1,13 +1,13 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/SecurityStore.java,v 1.3 2001/05/10 18:36:47 juergen Exp $
- * $Revision: 1.3 $
- * $Date: 2001/05/10 18:36:47 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/SecurityStore.java,v 1.4 2001/05/16 12:06:48 juergen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/05/16 12:06:48 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -23,15 +23,15 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
+ * from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
@@ -59,7 +59,7 @@
*
* [Additional notices, if required by prior licensing conditions]
*
- */
+ */
package org.apache.slide.store;
@@ -76,9 +76,9 @@
/**
* Store for NodePermission objects.
- *
+ *
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public interface SecurityStore extends Service {
@@ -88,45 +88,41 @@
/**
* Grant a new permission.
- *
+ *
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Data Source
*/
- void grantPermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ void grantPermission(Uri uri, NodePermission permission)
throws ServiceAccessException;
/**
* Revoke a permission.
- *
+ *
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Data Source
*/
- void revokePermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ void revokePermission(Uri uri, NodePermission permission)
throws ServiceAccessException;
/**
* Revoke all the permissions on an object.
- *
+ *
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Data Source
*/
- void revokePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ void revokePermissions(Uri uri)
throws ServiceAccessException;
/**
* Enumerate permissions on an object.
- *
+ *
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Data Source
*/
- Enumeration enumeratePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ Enumeration enumeratePermissions(Uri uri)
throws ServiceAccessException;
1.12 +20 -29 jakarta-slide/src/share/org/apache/slide/store/StandardStore.java
Index: StandardStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/StandardStore.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StandardStore.java 2001/05/10 18:36:49 1.11
+++ StandardStore.java 2001/05/16 12:06:50 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/StandardStore.java,v 1.11 2001/05/10 18:36:49 juergen Exp $
- * $Revision: 1.11 $
- * $Date: 2001/05/10 18:36:49 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/StandardStore.java,v 1.12 2001/05/16 12:06:50 juergen Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/05/16 12:06:50 $
*
* ====================================================================
*
@@ -80,7 +80,7 @@
* Abstract implementation of a store. Handles all caching operations.
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class StandardStore extends AbstractStore {
@@ -231,12 +231,11 @@
* Store an object permissions in the Descriptors Store.
*
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void grantPermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void grantPermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
- super.grantPermission(uri, revisionDescriptor, permission);
+ super.grantPermission(uri, permission);
if (securityStore.cacheResults()) {
NodePermission tempPermission = permission.cloneObject();
Object value = permissionsCache.get(uri.toString());
@@ -256,12 +255,11 @@
* Store an object permissions in the Descriptors Store.
*
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void revokePermission(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodePermission permission)
+ public void revokePermission(Uri uri, NodePermission permission)
throws ServiceAccessException {
- super.revokePermission(uri, revisionDescriptor, permission);
+ super.revokePermission(uri, permission);
if (securityStore.cacheResults()) {
Object value = permissionsCache.get(uri.toString());
Vector permissionsVector = null;
@@ -277,12 +275,11 @@
* Revoke all the permissions on the object.
*
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public void revokePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public void revokePermissions(Uri uri)
throws ServiceAccessException {
- super.revokePermissions(uri, revisionDescriptor);
+ super.revokePermissions(uri);
if (securityStore.cacheResults()) {
Object value = permissionsCache.get(uri.toString());
Vector permissionsVector = null;
@@ -298,10 +295,9 @@
* Read an object permissions.
*
* @param permission Permission we want to create
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Error accessing the Descriptors Store
*/
- public Enumeration enumeratePermissions(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumeratePermissions(Uri uri)
throws ServiceAccessException {
// TODO : The vectors elements MUST be cloned
if (securityStore.cacheResults()) {
@@ -312,7 +308,7 @@
return permissionsVector.elements();
} else {
permissionsVector = new Vector();
- Enumeration tempEnum = securityStore.enumeratePermissions(uri, revisionDescriptor);
+ Enumeration tempEnum = securityStore.enumeratePermissions(uri);
while (tempEnum.hasMoreElements()) {
NodePermission tempPermission =
(NodePermission) tempEnum.nextElement();
@@ -323,7 +319,7 @@
return permissionsVector.elements();
}
} else {
- return super.enumeratePermissions(uri, revisionDescriptor);
+ return super.enumeratePermissions(uri);
}
}
@@ -332,12 +328,11 @@
* Puts a lock on a subject.
*
* @param lock Lock token
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
*/
- public void putLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void putLock(Uri uri, NodeLock lock)
throws ServiceAccessException {
- super.putLock(uri, revisionDescriptor, lock);
+ super.putLock(uri, lock);
if (lockStore.cacheResults()) {
Object value = locksCache.get(uri.toString());
Vector locksVector = null;
@@ -356,13 +351,12 @@
* Renews a lock.
*
* @param lock Token to renew
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void renewLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void renewLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
- super.renewLock(uri, revisionDescriptor, lock);
+ super.renewLock(uri, lock);
if (lockStore.cacheResults()) {
Object value = locksCache.get(uri.toString());
Vector locksVector = null;
@@ -382,13 +376,12 @@
* Removes (cancels) a lock.
*
* @param lock Token to remove
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void removeLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void removeLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
- super.removeLock(uri, revisionDescriptor, lock);
+ super.removeLock(uri, lock);
if (lockStore.cacheResults()) {
Object value = locksCache.get(uri.toString());
Vector locksVector = null;
@@ -407,13 +400,12 @@
* Kills a lock.
*
* @param lock Token to remove
- * @param revisionDescriptor Node revision descriptor
* @exception ServiceAccessException Service access error
* @exception LockTokenNotFoundException Lock token was not found
*/
- public void killLock(Uri uri, NodeRevisionDescriptor revisionDescriptor, NodeLock lock)
+ public void killLock(Uri uri, NodeLock lock)
throws ServiceAccessException, LockTokenNotFoundException {
- super.killLock(uri, revisionDescriptor, lock);
+ super.killLock(uri, lock);
if (lockStore.cacheResults()) {
Object value = locksCache.get(uri.toString());
Vector locksVector = null;
@@ -432,18 +424,17 @@
* Returns the list of locks put on a subject.
*
* @param subject Subject
- * @param revisionDescriptor Node revision descriptor
* @return Enumeration List of locks which have been put on the subject
* @exception ServiceAccessException Service access error
*/
- public Enumeration enumerateLocks(Uri uri, NodeRevisionDescriptor revisionDescriptor)
+ public Enumeration enumerateLocks(Uri uri)
throws ServiceAccessException {
if (lockStore.cacheResults()) {
Object value = locksCache.get(uri.toString());
Vector locksVector = null;
if (value == null) {
locksVector = new Vector();
- Enumeration lockList = lockStore.enumerateLocks(uri, revisionDescriptor);
+ Enumeration lockList = lockStore.enumerateLocks(uri);
while (lockList.hasMoreElements()) {
NodeLock tempLock = (NodeLock) lockList.nextElement();
tempLock.validate(uri.toString());
@@ -455,7 +446,7 @@
}
return locksVector.elements();
} else {
- return super.enumerateLocks(uri, revisionDescriptor);
+ return super.enumerateLocks(uri);
}
}