pnever 2003/10/16 03:01:15
Modified: src/webdav/server/org/apache/slide/webdav/method
AclMethod.java
Log:
Minor
Revision Changes Path
1.33 +3 -35
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- AclMethod.java 8 Sep 2003 12:34:53 -0000 1.32
+++ AclMethod.java 16 Oct 2003 10:01:15 -0000 1.33
@@ -333,7 +333,6 @@
addPermission (principal,
config.getRevokePermissionAction().getUri(), negative, inheritable);
break;
case PRIVILEGE_USER_DEFINED:
- String userPrivilege = null;
List privileges = privilegeElement.getChildren();
if (privileges.size() != 1) {
int statusCode =
WebdavStatus.SC_INTERNAL_SERVER_ERROR;
@@ -502,37 +501,6 @@
return PRIVILEGE_READ_ACL;
} else if (hasChild(privilege, NamespaceCache.DEFAULT_NAMESPACE,
"write-acl")) {
return PRIVILEGE_WRITE_ACL;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "read-object")) {
- // return PRIVILEGE_READ_OBJECT;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "read-revision-metadata")) {
- // return PRIVILEGE_READ_REVISION_METADATA;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "read-revision-content")) {
- // return PRIVILEGE_READ_REVISION_CONTENT;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "create-object")) {
- // return PRIVILEGE_CREATE_OBJECT;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "remove-object")) {
- // return PRIVILEGE_REMOVE_OBJECT;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "lock-object")) {
- // return PRIVILEGE_LOCK_OBJECT;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "read-locks")) {
- // return PRIVILEGE_READ_LOCKS;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "create-revision-metadata")) {
- // return PRIVILEGE_CREATE_REVISION_METADATA;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "modify-revision-metadata")) {
- // return PRIVILEGE_MODIFY_REVISION_METADATA;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "remove-revision-metadata")) {
- // return PRIVILEGE_REMOVE_REVISION_METADATA;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "create-revision-content")) {
- // return PRIVILEGE_CREATE_REVISION_CONTENT;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "modify-revision-content")) {
- // return PRIVILEGE_MODIFY_REVISION_CONTENT;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "remove-revision-content")) {
- // return PRIVILEGE_REMOVE_REVISION_CONTENT;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "grant-permission")) {
- // return PRIVILEGE_GRANT_PERMISSION;
- // } else if (hasChild(privilege,
NamespaceCache.SLIDE_NAMESPACE, "revoke-permission")) {
- // return PRIVILEGE_REVOKE_PERMISSION;
-
} else {
if (allow_user_privileges){
return PRIVILEGE_USER_DEFINED;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
