juergen 01/05/16 05:08:11
Modified: src/webdav/server/org/apache/slide/webdav/method
AclMethod.java GetMethod.java LockMethod.java
PropFindMethod.java UnlockMethod.java
WebdavMethod.java
Log:
removed the NRD from the API, to be put in NodePermission, see e-mails.
Revision Changes Path
1.3 +69 -69
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java
Index: AclMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AclMethod.java 2001/05/10 18:32:53 1.2
+++ AclMethod.java 2001/05/16 12:07:50 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java,v
1.2 2001/05/10 18:32:53 juergen Exp $
- * $Revision: 1.2 $
- * $Date: 2001/05/10 18:32:53 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AclMethod.java,v
1.3 2001/05/16 12:07:50 juergen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/05/16 12:07:50 $
*
* ====================================================================
*
@@ -181,7 +181,7 @@
Element rootElement = document.getDocumentElement();
//NodeList childList = rootElement.getChildNodes();
- NodeList aclList =
+ NodeList aclList =
rootElement.getElementsByTagNameNS
(NodeProperty.DEFAULT_NAMESPACE, "acl");
@@ -236,12 +236,12 @@
NodeList denyList = ace.getElementsByTagNameNS
(NodeProperty.DEFAULT_NAMESPACE, "deny");
- if ((grantList.getLength() > 0) &&
+ if ((grantList.getLength() > 0) &&
(denyList.getLength() > 0)) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
}
- if ((grantList.getLength() == 0) &&
+ if ((grantList.getLength() == 0) &&
(denyList.getLength() == 0)) {
resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
@@ -257,125 +257,125 @@
privilegeList = grantList;
}
- boolean inheritable = true;
+ boolean inheritable = true;
// FIXME : Use the very unofficial Advanced ACL spec here.
for (int j = 0; i < privilegeList.getLength(); j++) {
- Element privilegeElement =
+ Element privilegeElement =
(Element) privilegeList.item(j);
int privilege = parsePrivilege(privilegeElement);
switch (privilege) {
case PRIVILEGE_ALL:
- addPermission(principal, "/",
+ addPermission(principal, "/",
negative, inheritable);
break;
case PRIVILEGE_READ:
addPermission
- (principal,
- config.getReadObjectAction().getUri(),
+ (principal,
+ config.getReadObjectAction().getUri(),
negative, inheritable);
addPermission
- (principal,
+ (principal,
config.getReadRevisionMetadataAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
addPermission
- (principal,
+ (principal,
config.getReadRevisionContentAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
addPermission
- (principal,
- config.getReadLocksAction().getUri(),
+ (principal,
+ config.getReadLocksAction().getUri(),
negative, inheritable);
break;
case PRIVILEGE_READ_OBJECT:
addPermission
- (principal,
- config.getReadObjectAction().getUri(),
+ (principal,
+ config.getReadObjectAction().getUri(),
negative, inheritable);
break;
case PRIVILEGE_READ_REVISION_METADATA:
addPermission
- (principal,
+ (principal,
config.getReadRevisionMetadataAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
break;
case PRIVILEGE_READ_REVISION_CONTENT:
addPermission
- (principal,
+ (principal,
config.getReadRevisionContentAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
break;
case PRIVILEGE_WRITE:
addPermission
- (principal,
- config.getCreateObjectAction().getUri(),
+ (principal,
+ config.getCreateObjectAction().getUri(),
negative, inheritable);
addPermission
- (principal,
- config.getRemoveObjectAction().getUri(),
+ (principal,
+ config.getRemoveObjectAction().getUri(),
negative, inheritable);
addPermission
- (principal,
- config.getLockObjectAction().getUri(),
+ (principal,
+ config.getLockObjectAction().getUri(),
negative, inheritable);
addPermission
- (principal,
+ (principal,
config.getCreateRevisionMetadataAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
addPermission
- (principal,
+ (principal,
config.getModifyRevisionMetadataAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
addPermission
- (principal,
+ (principal,
config.getRemoveRevisionMetadataAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
addPermission
- (principal,
+ (principal,
config.getCreateRevisionContentAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
addPermission
- (principal,
+ (principal,
config.getModifyRevisionContentAction()
- .getUri(),
+ .getUri(),
negative, inheritable);
break;
case PRIVILEGE_READ_ACL:
addPermission
- (principal,
- config.getReadPermissionsAction().getUri(),
+ (principal,
+ config.getReadPermissionsAction().getUri(),
negative, inheritable);
break;
case PRIVILEGE_WRITE_ACL:
addPermission
- (principal,
- config.getGrantPermissionAction().getUri(),
+ (principal,
+ config.getGrantPermissionAction().getUri(),
negative, inheritable);
addPermission
- (principal,
- config.getRevokePermissionAction().getUri(),
+ (principal,
+ config.getRevokePermissionAction().getUri(),
negative, inheritable);
break;
case PRIVILEGE_GRANT_PERMISSION:
addPermission
- (principal,
- config.getGrantPermissionAction().getUri(),
+ (principal,
+ config.getGrantPermissionAction().getUri(),
negative, inheritable);
break;
case PRIVILEGE_REVOKE_PERMISSION:
addPermission
- (principal,
- config.getRevokePermissionAction().getUri(),
+ (principal,
+ config.getRevokePermissionAction().getUri(),
negative, inheritable);
break;
}
@@ -415,7 +415,7 @@
try {
- security.setPermissions(slideToken, resourcePath,
dummyNodeRevisionDescriptor,
+ security.setPermissions(slideToken, resourcePath,
permissions.elements());
} catch (ObjectNotFoundException e) {
@@ -451,22 +451,22 @@
/**
* Parse principal.
- *
+ *
* @return the URI of the principal
*/
protected String parsePrincipal(Element principal)
throws WebdavException {
- NodeList hrefList =
- principal.getElementsByTagNameNS(NodeProperty.DEFAULT_NAMESPACE,
+ NodeList hrefList =
+ principal.getElementsByTagNameNS(NodeProperty.DEFAULT_NAMESPACE,
"href");
if (hrefList.getLength() == 1) {
Element href = (Element) hrefList.item(0);
if (href.getFirstChild().getNodeType() == Node.TEXT_NODE)
return href.getFirstChild().getNodeValue();
- } else if (hasChild(principal, NodeProperty.DEFAULT_NAMESPACE,
+ } else if (hasChild(principal, NodeProperty.DEFAULT_NAMESPACE,
"all")) {
return "/";
- } else if (hasChild(principal, NodeProperty.DEFAULT_NAMESPACE,
+ } else if (hasChild(principal, NodeProperty.DEFAULT_NAMESPACE,
"unauthenticated")) {
return token.getNamespaceConfig().getUsersPath() + "/"
+ token.getNamespaceConfig().getGuestPath();
@@ -477,7 +477,7 @@
/**
* Parse privilege.
- *
+ *
* @return privilege
*/
protected int parsePrivilege(Element privilege)
@@ -485,24 +485,24 @@
if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE, "all")) {
return PRIVILEGE_ALL;
- } else if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE,
+ } else if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE,
"read")) {
return PRIVILEGE_READ;
- } else if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE,
+ } else if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE,
"write")) {
return PRIVILEGE_WRITE;
- } else if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE,
+ } else if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE,
"read-acl")) {
return PRIVILEGE_READ_ACL;
- } else if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE,
+ } else if (hasChild(privilege, NodeProperty.DEFAULT_NAMESPACE,
"write-acl")) {
return PRIVILEGE_WRITE_ACL;
} else if (hasChild(privilege, SLIDE_NAMESPACE, "read-object")) {
return PRIVILEGE_READ_OBJECT;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"read-revision-metadata")) {
return PRIVILEGE_READ_REVISION_METADATA;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"read-revision-content")) {
return PRIVILEGE_READ_REVISION_CONTENT;
} else if (hasChild(privilege, SLIDE_NAMESPACE, "create-object")) {
@@ -513,25 +513,25 @@
return PRIVILEGE_LOCK_OBJECT;
} else if (hasChild(privilege, SLIDE_NAMESPACE, "read-locks")) {
return PRIVILEGE_READ_LOCKS;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"create-revision-metadata")) {
return PRIVILEGE_CREATE_REVISION_METADATA;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"modify-revision-metadata")) {
return PRIVILEGE_MODIFY_REVISION_METADATA;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"remove-revision-metadata")) {
return PRIVILEGE_REMOVE_REVISION_METADATA;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"create-revision-content")) {
return PRIVILEGE_CREATE_REVISION_CONTENT;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"modify-revision-content")) {
return PRIVILEGE_MODIFY_REVISION_CONTENT;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"grant-permission")) {
return PRIVILEGE_GRANT_PERMISSION;
- } else if (hasChild(privilege, SLIDE_NAMESPACE,
+ } else if (hasChild(privilege, SLIDE_NAMESPACE,
"revoke-permission")) {
return PRIVILEGE_REVOKE_PERMISSION;
} else {
@@ -544,9 +544,9 @@
/**
* Has specified child element ?
*/
- protected boolean hasChild(Element element, String namespace,
+ protected boolean hasChild(Element element, String namespace,
String name) {
- return
+ return
(element.getElementsByTagNameNS(namespace, name).getLength() == 1);
}
@@ -555,7 +555,7 @@
/**
* Add permission to the list of permissions to set.
*/
- protected void addPermission(String principal, String action,
+ protected void addPermission(String principal, String action,
boolean negative, boolean inheritable) {
NodePermission permission = new NodePermission
(resourcePath, principal, action, inheritable, negative);
1.9 +4 -4
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GetMethod.java 2001/05/10 18:34:01 1.8
+++ GetMethod.java 2001/05/16 12:07:52 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
1.8 2001/05/10 18:34:01 juergen Exp $
- * $Revision: 1.8 $
- * $Date: 2001/05/10 18:34:01 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/GetMethod.java,v
1.9 2001/05/16 12:07:52 juergen Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/05/16 12:07:52 $
*
* ====================================================================
*
@@ -406,8 +406,8 @@
try {
permissionsList =
- security.enumeratePermissions(slideToken, object.getUri(),
dummyNodeRevisionDescriptor);
- locksList = lock.enumerateLocks(slideToken, object.getUri(),
dummyNodeRevisionDescriptor);
+ security.enumeratePermissions(slideToken, object.getUri());
+ locksList = lock.enumerateLocks(slideToken, object.getUri());
} catch (SlideException e) {
@@ -478,8 +478,8 @@
try {
permissionsList =
- security.enumeratePermissions(slideToken, currentResource,
dummyNodeRevisionDescriptor);
- locksList = lock.enumerateLocks(slideToken, currentResource,
dummyNodeRevisionDescriptor);
+ security.enumeratePermissions(slideToken, currentResource);
+ locksList = lock.enumerateLocks(slideToken, currentResource);
} catch (SlideException e) {
1.12 +10 -10
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LockMethod.java 2001/05/10 18:34:02 1.11
+++ LockMethod.java 2001/05/16 12:07:54 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.11 2001/05/10 18:34:02 juergen Exp $
- * $Revision: 1.11 $
- * $Date: 2001/05/10 18:34:02 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LockMethod.java,v
1.12 2001/05/16 12:07:54 juergen Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/05/16 12:07:54 $
*
* ====================================================================
*
@@ -480,14 +480,14 @@
new NodeLock(toLockSubject, credentialsSubject,
namespaceConfig.getCreateObjectAction(),
lockDate, inheritance, exclusive);
- lock.lock(slideToken, dummyNodeRevisionDescriptor, lockToken);
+ lock.lock(slideToken, lockToken);
try {
lockToken = new NodeLock
(lockToken,
namespaceConfig.getCreateRevisionMetadataAction()
.getUri());
- lock.lock(slideToken, dummyNodeRevisionDescriptor, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -497,7 +497,7 @@
(lockToken,
namespaceConfig.getModifyRevisionMetadataAction()
.getUri());
- lock.lock(slideToken, dummyNodeRevisionDescriptor, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -507,7 +507,7 @@
(lockToken,
namespaceConfig.getRemoveRevisionMetadataAction()
.getUri());
- lock.lock(slideToken, dummyNodeRevisionDescriptor, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -517,7 +517,7 @@
(lockToken,
namespaceConfig.getModifyRevisionContentAction()
.getUri());
- lock.lock(slideToken, dummyNodeRevisionDescriptor, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -527,7 +527,7 @@
(lockToken,
namespaceConfig.getRemoveRevisionContentAction()
.getUri());
- lock.lock(slideToken, dummyNodeRevisionDescriptor, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -537,7 +537,7 @@
new NodeLock(lockToken,
namespaceConfig.getRemoveObjectAction()
.getUri());
- lock.lock(slideToken, dummyNodeRevisionDescriptor, lockToken);
+ lock.lock(slideToken, lockToken);
} catch (ObjectIsAlreadyLockedException e) {
// Silent catch
}
@@ -563,15 +563,15 @@
try {
Enumeration lockTokens =
- lock.enumerateLocks(slideToken, lockInfo_lockSubject,
dummyNodeRevisionDescriptor);
+ lock.enumerateLocks(slideToken, lockInfo_lockSubject);
NodeLock currentLockToken = null;
Date newExpirationDate =
new Date((new Date()).getTime() + (lockDuration * 1000));
while (lockTokens.hasMoreElements()) {
currentLockToken = (NodeLock) lockTokens.nextElement();
- lock.renew(slideToken, dummyNodeRevisionDescriptor,
- currentLockToken, newExpirationDate);
+ lock.renew(slideToken, currentLockToken,
+ newExpirationDate);
}
showLockDiscoveryInfo(currentLockToken);
1.22 +93 -93
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PropFindMethod.java 2001/05/10 18:36:27 1.21
+++ PropFindMethod.java 2001/05/16 12:07:56 1.22
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.21 2001/05/10 18:36:27 juergen Exp $
- * $Revision: 1.21 $
- * $Date: 2001/05/10 18:36:27 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
1.22 2001/05/16 12:07:56 juergen Exp $
+ * $Revision: 1.22 $
+ * $Date: 2001/05/16 12:07:56 $
*
* ====================================================================
*
@@ -601,8 +601,8 @@
generatedXML.writeElement(null, "href", XMLPrinter.CLOSING);
- Enumeration lockTokens = lock.enumerateLocks(slideToken,
object.getUri(),
-
dummyNodeRevisionDescriptor);
+ Enumeration lockTokens = lock.enumerateLocks(slideToken,
+ object.getUri());
if (lockTokens.hasMoreElements()) {
objectLockToken = (NodeLock) lockTokens.nextElement();
@@ -1039,8 +1039,8 @@
generatedXML.writeElement(null, "owner", XMLPrinter.OPENING);
/* We need to write this as data (i.e. a CDATA section) because
- * we don't know what the subjectUri (i.e. username) might
- * contain. The webdav RFC leaves us completely free to
+ * we don't know what the subjectUri (i.e. username) might
+ * contain. The webdav RFC leaves us completely free to
* put whatever we want inside the owner element.
*/
generatedXML.writeData(token.getSubjectUri());
@@ -1109,56 +1109,56 @@
try {
boolean readObject =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode, config.getReadObjectAction());
+ security.hasPermission(object, principalNode,
+ config.getReadObjectAction());
boolean createObject =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode,
config.getCreateObjectAction());
+ security.hasPermission(object, principalNode,
+ config.getCreateObjectAction());
boolean removeObject =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode,
config.getRemoveObjectAction());
+ security.hasPermission(object, principalNode,
+ config.getRemoveObjectAction());
boolean grantPermission =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode,
config.getGrantPermissionAction());
+ security.hasPermission(object, principalNode,
+ config.getGrantPermissionAction());
boolean revokePermission =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode,
config.getRevokePermissionAction());
+ security.hasPermission(object, principalNode,
+ config.getRevokePermissionAction());
boolean readPermissions =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode,
config.getReadPermissionsAction());
+ security.hasPermission(object, principalNode,
+ config.getReadPermissionsAction());
boolean lockObject =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode, config.getLockObjectAction());
+ security.hasPermission(object, principalNode,
+ config.getLockObjectAction());
boolean killLock =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode, config.getKillLockAction());
+ security.hasPermission(object, principalNode,
+ config.getKillLockAction());
boolean readLocks =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode, config.getReadLocksAction());
+ security.hasPermission(object, principalNode,
+ config.getReadLocksAction());
boolean readRevisionMetadata =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
- principalNode,
config.getReadRevisionMetadataAction());
+ security.hasPermission(object, principalNode,
+ config.getReadRevisionMetadataAction());
boolean createRevisionMetadata = security.hasPermission
- (object, dummyNodeRevisionDescriptor,
- principalNode, config.getCreateRevisionMetadataAction());
+ (object, principalNode,
+ config.getCreateRevisionMetadataAction());
boolean modifyRevisionMetadata = security.hasPermission
- (object, dummyNodeRevisionDescriptor,
- principalNode, config.getModifyRevisionMetadataAction());
+ (object, principalNode,
+ config.getModifyRevisionMetadataAction());
boolean removeRevisionMetadata = security.hasPermission
- (object, dummyNodeRevisionDescriptor,
- principalNode, config.getRemoveRevisionMetadataAction());
+ (object, principalNode,
+ config.getRemoveRevisionMetadataAction());
boolean readRevisionContent =
- security.hasPermission(object, dummyNodeRevisionDescriptor,
-
principalNode,config.getReadRevisionContentAction());
+ security.hasPermission(object, principalNode,
+ config.getReadRevisionContentAction());
boolean createRevisionContent = security.hasPermission
- (object, dummyNodeRevisionDescriptor,
- principalNode, config.getCreateRevisionContentAction());
+ (object, principalNode,
+ config.getCreateRevisionContentAction());
boolean modifyRevisionContent = security.hasPermission
- (object, dummyNodeRevisionDescriptor,
- principalNode, config.getModifyRevisionContentAction());
+ (object, principalNode,
+ config.getModifyRevisionContentAction());
boolean removeRevisionContent = security.hasPermission
- (object, dummyNodeRevisionDescriptor,
- principalNode, config.getRemoveRevisionContentAction());
+ (object, principalNode,
+ config.getRemoveRevisionContentAction());
boolean canRead = readObject && readRevisionMetadata
&& readRevisionContent;
@@ -1224,7 +1224,7 @@
// read
String readObjectUri = config.getReadObjectAction().getUri();
- String readRevisionMetadataUri =
+ String readRevisionMetadataUri =
config.getReadRevisionMetadataAction().getUri();
String readRevisionContentUri =
config.getReadRevisionContentAction().getUri();
@@ -1234,17 +1234,17 @@
String removeObjectUri = config.getRemoveObjectAction().getUri();
String lockObjectUri = config.getLockObjectAction().getUri();
String readLocksUri = config.getReadLocksAction().getUri();
- String createRevisionMetadataUri =
+ String createRevisionMetadataUri =
config.getCreateRevisionMetadataAction().getUri();
- String modifyRevisionMetadataUri =
+ String modifyRevisionMetadataUri =
config.getModifyRevisionMetadataAction().getUri();
- String removeRevisionMetadataUri =
+ String removeRevisionMetadataUri =
config.getRemoveRevisionMetadataAction().getUri();
- String createRevisionContentUri =
+ String createRevisionContentUri =
config.getCreateRevisionContentAction().getUri();
- String modifyRevisionContentUri =
+ String modifyRevisionContentUri =
config.getModifyRevisionContentAction().getUri();
- String removeRevisionContentUri =
+ String removeRevisionContentUri =
config.getRemoveRevisionContentAction().getUri();
// read-acl
@@ -1252,7 +1252,7 @@
// write-acl
String grantPermissionUri = config.getGrantPermissionAction().getUri();
- String revokePermissionUri =
+ String revokePermissionUri =
config.getRevokePermissionAction().getUri();
ObjectNode current = object;
@@ -1263,7 +1263,7 @@
try {
Enumeration aclList = security.enumeratePermissions
- (slideToken, current, dummyNodeRevisionDescriptor);
+ (slideToken, current);
while (aclList.hasMoreElements()) {
@@ -1276,18 +1276,18 @@
// read
boolean isReadObject = readObjectUri.startsWith(action);
- boolean isReadRevisionMetadata =
+ boolean isReadRevisionMetadata =
readRevisionMetadataUri.startsWith(action);
- boolean isReadRevisionContent =
+ boolean isReadRevisionContent =
readRevisionContentUri.startsWith(action);
boolean isRead = isReadObject && isReadRevisionMetadata
&& isReadRevisionContent;
// write
- boolean isCreateObject =
+ boolean isCreateObject =
createObjectUri.startsWith(action);
- boolean isRemoveObject =
+ boolean isRemoveObject =
removeObjectUri.startsWith(action);
boolean isLockObject = lockObjectUri.startsWith(action);
boolean isReadLocks = readLocksUri.startsWith(action);
@@ -1305,28 +1305,28 @@
removeRevisionContentUri.startsWith(action);
boolean isWrite = isCreateObject && isRemoveObject
- && isLockObject && isReadLocks
+ && isLockObject && isReadLocks
&& isCreateRevisionMetadata
&& isModifyRevisionMetadata && isRemoveRevisionMetadata
- && isCreateRevisionContent && isModifyRevisionContent
+ && isCreateRevisionContent && isModifyRevisionContent
&& isRemoveRevisionContent;
//read-acl
- boolean isReadPermissions =
+ boolean isReadPermissions =
readPermissionsUri.startsWith(action);
boolean isReadAcl = isReadPermissions;
// write-acl
- boolean isGrantPermission =
+ boolean isGrantPermission =
grantPermissionUri.startsWith(action);
boolean isRevokePermission =
revokePermissionUri.startsWith(action);
- boolean isWriteAcl =
+ boolean isWriteAcl =
isGrantPermission && isRevokePermission;
- boolean isAll = isRead && isWrite && isReadAcl
+ boolean isAll = isRead && isWrite && isReadAcl
&& isWriteAcl;
generatedXML.writeElement(null, ACE, XMLPrinter.OPENING);
@@ -1334,10 +1334,10 @@
writePrincipal(generatedXML, principal);
if (permission.isNegative()) {
- generatedXML.writeElement(null, DENY,
+ generatedXML.writeElement(null, DENY,
XMLPrinter.OPENING);
} else {
- generatedXML.writeElement(null, GRANT,
+ generatedXML.writeElement(null, GRANT,
XMLPrinter.OPENING);
}
@@ -1348,54 +1348,54 @@
writePrivilege(generatedXML, "read", true);
} else {
if (isReadObject)
- writePrivilege(generatedXML,
+ writePrivilege(generatedXML,
"read-object", false);
if (isReadRevisionMetadata)
- writePrivilege(generatedXML,
- "read-revision-metadata",
+ writePrivilege(generatedXML,
+ "read-revision-metadata",
false);
if (isReadRevisionContent)
- writePrivilege(generatedXML,
+ writePrivilege(generatedXML,
"read-revision-content", false);
}
if (isWrite) {
writePrivilege(generatedXML, "write", true);
} else {
if (isCreateObject)
- writePrivilege(generatedXML,
+ writePrivilege(generatedXML,
"create-object", false);
if (isRemoveObject)
- writePrivilege(generatedXML,
+ writePrivilege(generatedXML,
"remove-object", false);
if (isLockObject)
- writePrivilege(generatedXML,
+ writePrivilege(generatedXML,
"lock-object", false);
if (isReadLocks)
- writePrivilege(generatedXML,
+ writePrivilege(generatedXML,
"read-locks", false);
if (isCreateRevisionMetadata)
- writePrivilege(generatedXML,
- "create-revision-metadata",
+ writePrivilege(generatedXML,
+ "create-revision-metadata",
false);
if (isModifyRevisionMetadata)
- writePrivilege(generatedXML,
- "modify-revision-metadata",
+ writePrivilege(generatedXML,
+ "modify-revision-metadata",
false);
if (isRemoveRevisionMetadata)
- writePrivilege(generatedXML,
- "remove-revision-metadata",
+ writePrivilege(generatedXML,
+ "remove-revision-metadata",
false);
if (isCreateRevisionContent)
- writePrivilege(generatedXML,
- "create-revision-content",
+ writePrivilege(generatedXML,
+ "create-revision-content",
false);
if (isModifyRevisionContent)
- writePrivilege(generatedXML,
- "modify-revision-content",
+ writePrivilege(generatedXML,
+ "modify-revision-content",
false);
if (isRemoveRevisionContent)
- writePrivilege(generatedXML,
- "remove-revision-content",
+ writePrivilege(generatedXML,
+ "remove-revision-content",
false);
}
if (isReadAcl) {
@@ -1405,33 +1405,33 @@
writePrivilege(generatedXML, "write-acl", true);
} else {
if (isGrantPermission)
- writePrivilege(generatedXML,
+ writePrivilege(generatedXML,
"grant-permission", false);
if (isRevokePermission)
- writePrivilege(generatedXML,
+ writePrivilege(generatedXML,
"revoke-permission", false);
}
}
if (permission.isNegative()) {
- generatedXML.writeElement(null, DENY,
+ generatedXML.writeElement(null, DENY,
XMLPrinter.CLOSING);
} else {
- generatedXML.writeElement(null, GRANT,
+ generatedXML.writeElement(null, GRANT,
XMLPrinter.CLOSING);
}
if (inheritedPermissions) {
- generatedXML.writeElement(null, "protected",
+ generatedXML.writeElement(null, "protected",
XMLPrinter.NO_CONTENT);
- generatedXML.writeElement(null, INHERITED,
+ generatedXML.writeElement(null, INHERITED,
XMLPrinter.OPENING);
- generatedXML.writeElement(null, "href",
+ generatedXML.writeElement(null, "href",
XMLPrinter.OPENING);
generatedXML.writeText(getFullPath(current.getUri()));
- generatedXML.writeElement(null, "href",
+ generatedXML.writeElement(null, "href",
XMLPrinter.CLOSING);
- generatedXML.writeElement(null, INHERITED,
+ generatedXML.writeElement(null, INHERITED,
XMLPrinter.CLOSING);
}
@@ -1461,12 +1461,12 @@
*/
protected void writePrincipal(XMLPrinter generatedXML, String principal) {
generatedXML.writeElement(null, PRINCIPAL, XMLPrinter.OPENING);
- // FIXME: Apparently, there are or will be some other cases, but it
+ // FIXME: Apparently, there are or will be some other cases, but it
// isn't very clear in the spec
if (principal.equals("~")) {
generatedXML.writeElement(null, "self", XMLPrinter.NO_CONTENT);
} if (principal.equals("nobody")) {
- generatedXML.writeElement(null, "all",
+ generatedXML.writeElement(null, "all",
XMLPrinter.NO_CONTENT);
} else {
generatedXML.writeElement(null, "href", XMLPrinter.OPENING);
@@ -1486,7 +1486,7 @@
if (standard) {
generatedXML.writeElement(null, name, XMLPrinter.NO_CONTENT);
} else {
- generatedXML.writeElement(SLIDE_NAMESPACE_ABBREV, name,
+ generatedXML.writeElement(SLIDE_NAMESPACE_ABBREV, name,
XMLPrinter.NO_CONTENT);
}
generatedXML.writeElement(null, PRIVILEGE, XMLPrinter.CLOSING);
@@ -1508,12 +1508,12 @@
*/
protected void showPrincipalCollectionSet(XMLPrinter generatedXML) {
NamespaceConfig config = token.getNamespaceConfig();
- generatedXML.writeElement(null, PRINCIPAL_COLLECTION_SET,
+ generatedXML.writeElement(null, PRINCIPAL_COLLECTION_SET,
XMLPrinter.OPENING);
generatedXML.writeElement(null, "href", XMLPrinter.OPENING);
generatedXML.writeText(getFullPath(config.getUsersPath()));
generatedXML.writeElement(null, "href", XMLPrinter.CLOSING);
- generatedXML.writeElement(null, PRINCIPAL_COLLECTION_SET,
+ generatedXML.writeElement(null, PRINCIPAL_COLLECTION_SET,
XMLPrinter.CLOSING);
}
1.8 +1 -1
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java
Index: UnlockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- UnlockMethod.java 2001/05/10 18:36:29 1.7
+++ UnlockMethod.java 2001/05/16 12:07:58 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.7 2001/05/10 18:36:29 juergen Exp $
- * $Revision: 1.7 $
- * $Date: 2001/05/10 18:36:29 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
1.8 2001/05/16 12:07:58 juergen Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/05/16 12:07:58 $
*
* ====================================================================
*
@@ -156,7 +156,7 @@
try {
- lock.unlock(slideToken, requestUri, dummyNodeRevisionDescriptor,
lockId);
+ lock.unlock(slideToken, requestUri, lockId);
// Checking if the resource at the URI isn't a lock-null
// resource, in which case we must attempt to delete it
1.21 +0 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java
Index: WebdavMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WebdavMethod.java 2001/05/10 18:36:30 1.20
+++ WebdavMethod.java 2001/05/16 12:07:59 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
1.20 2001/05/10 18:36:30 juergen Exp $
- * $Revision: 1.20 $
- * $Date: 2001/05/10 18:36:30 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/WebdavMethod.java,v
1.21 2001/05/16 12:07:59 juergen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/05/16 12:07:59 $
*
* ====================================================================
*
@@ -92,13 +92,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
*/
public abstract class WebdavMethod {
-
-
- /** protected field to indicate, that the versionNumber is not correctly
supported yet
- **/
- protected static final NodeRevisionDescriptor dummyNodeRevisionDescriptor =
null;
-
// -------------------------------------------------------------- Constants
