pnever 2003/09/22 08:48:56
Modified: src/webdav/server/org/apache/slide/webdav/util
AclConstants.java WebdavConstants.java
Log:
Moved DAV:modificationuser
Revision Changes Path
1.16 +91 -89
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AclConstants.java
Index: AclConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AclConstants.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- AclConstants.java 5 Aug 2003 08:56:16 -0000 1.15
+++ AclConstants.java 22 Sep 2003 15:48:56 -0000 1.16
@@ -77,30 +77,32 @@
public interface AclConstants extends WebdavConstants {
/** Resource Kinds */
- static String K_PRINCIPAL = "principal";
+ String K_PRINCIPAL = "principal";
/** Features */
- static String F_ACCESS_CONTROL = "access-control";
+ String F_ACCESS_CONTROL = "access-control";
/** Live Properties */
- static String P_ALTERNATE_URI_SET = "alternate-URI-set";
- static String P_OWNER = "owner";
- static String P_SUPPORTED_PRIVILEGE_SET = "supported-privilege-set";
- static String P_CURRENT_USER_PRIVILEGE_SET = "current-user-privilege-set";
- static String P_ACL = "acl";
- static String P_ACL_SEMANTICS = "acl-semantics";
- static String P_PRINCIPAL_COLLECTION_SET = "principal-collection-set";
- static String P_ACE = "ace";
- static String P_USER_COLLECTION = "user_collection";
- static String P_GROUP_COLLECTION = "group_collection";
- static String P_ROLE_COLLECTION = "role_collection";
- static String P_PRINCIPAL_URL = "principal-URL";
- static String P_GROUP_MEMBERSHIP = "group-membership";
- static String P_GROUP_MEMBER_SET = "group-member-set";
+ String P_ALTERNATE_URI_SET = "alternate-URI-set";
+ String P_OWNER = "owner";
+ String P_MODIFICATIONUSER = "modificationuser";
+ String P_SUPPORTED_PRIVILEGE_SET = "supported-privilege-set";
+ String P_CURRENT_USER_PRIVILEGE_SET = "current-user-privilege-set";
+ String P_ACL = "acl";
+ String P_ACL_SEMANTICS = "acl-semantics";
+ String P_PRINCIPAL_COLLECTION_SET = "principal-collection-set";
+ String P_ACE = "ace";
+ String P_USER_COLLECTION = "user_collection";
+ String P_GROUP_COLLECTION = "group_collection";
+ String P_ROLE_COLLECTION = "role_collection";
+ String P_PRINCIPAL_URL = "principal-URL";
+ String P_GROUP_MEMBERSHIP = "group-membership";
+ String P_GROUP_MEMBER_SET = "group-member-set";
String[] ACL_PROPERTIES = new String[] {
P_ALTERNATE_URI_SET,
P_OWNER,
+ P_MODIFICATIONUSER,
P_SUPPORTED_PRIVILEGE_SET,
P_CURRENT_USER_PRIVILEGE_SET,
P_ACL,
@@ -112,90 +114,90 @@
List ACL_PROPERTY_LIST =
Collections.unmodifiableList(Arrays.asList(ACL_PROPERTIES));
/** Methods */
- static String M_ACL = "ACL";
+ String M_ACL = "ACL";
/** Reports */
- static String R_ACL_PRINCIPAL_PROPS = "acl-principal-prop-set";
- static String R_PRINCIPAL_MATCH = "principal-match";
- static String R_PRINCIPAL_PROPERTY_SEARCH = "principal-property-search";
- static String R_PRINCIPAL_SEARCH_PROPERTY_SET =
"principal-search-property-set";
+ String R_ACL_PRINCIPAL_PROPS = "acl-principal-prop-set";
+ String R_PRINCIPAL_MATCH = "principal-match";
+ String R_PRINCIPAL_PROPERTY_SEARCH = "principal-property-search";
+ String R_PRINCIPAL_SEARCH_PROPERTY_SET = "principal-search-property-set";
/** XML Elements */
- static String E_ACE = "ace";
- static String E_ACE_COMBINATION = "ace-combination";
- static String E_ACL = "acl";
- static String E_ALL = "all";
- static String E_ALL_GRANT_BEFORE_DENY = "all-grant-before-any-deny";
- static String E_CASELESS_SUBSTRING = "caseless-substring";
- static String E_CREATE_OBJECT = "create-object";
- static String E_CREATE_REVISION_CONTENT = "create-revision-content";
- static String E_CREATE_REVISION_METADATA = "create-revision-metadata";
- static String E_DENY = "deny";
- static String E_DESCRIPTION = "description";
- static String E_GRANT = "grant";
- static String E_GRANT_PERMISSION = "grant-premission";
- static String E_INHERITED = "inherited";
- static String E_LOCK_OBJECT = "lock-object";
- static String E_MODIFY_REVISION_CONTENT = "modify-revision-content";
- static String E_MODIFY_REVISION_METADATA = "modify-revision-metadata";
- static String E_NON_SEARCHABLE_PROPERTY = "non-searchable-property";
- static String E_PRINCIPAL_COLLECTION_SET = "principal-collection-set";
- static String E_PRINCIPAL_PROPERTY = "principal-property";
- static String E_PRINCIPAL_SEARCH_PROPERTY = "principal-search-property";
- static String E_PRINCIPAL_URL = "principal-URL";
- static String E_PRIVILEGE = "privilege";
- static String E_PROPERTY_SEARCH = "property-search";
- static String E_PROTECTED = "protected";
- static String E_READ = "read";
- static String E_READ_ACL = "read-acl";
- static String E_READ_LOCKS = "read-locks";
- static String E_READ_OBJECT = "read-object";
- static String E_READ_REVISION_CONTENT = "read-revision-content";
- static String E_READ_REVISION_METADATA = "read-revision-metadata";
- static String E_REMOVE_OBJECT = "remove-object";
- static String E_REMOVE_REVISION_CONTENT = "remove-revision-content";
- static String E_REMOVE_REVISION_METADATA = "remove-revision-metadata";
- static String E_REQUIRED_PRINCIPAL = "required-principal";
- static String E_REVOKE_PERMISSION = "revoke-premission";
- static String E_SELF = "self";
- static String E_SUBSTRING = "substring";
- static String E_SUPPORTED_PRIVILEGE = "supported-privilege";
- static String E_UNAUTHENTICATED = "unauthenticated";
- static String E_WRITE_ACL = "write-acl";
+ String E_ACE = "ace";
+ String E_ACE_COMBINATION = "ace-combination";
+ String E_ACL = "acl";
+ String E_ALL = "all";
+ String E_ALL_GRANT_BEFORE_DENY = "all-grant-before-any-deny";
+ String E_CASELESS_SUBSTRING = "caseless-substring";
+ String E_CREATE_OBJECT = "create-object";
+ String E_CREATE_REVISION_CONTENT = "create-revision-content";
+ String E_CREATE_REVISION_METADATA = "create-revision-metadata";
+ String E_DENY = "deny";
+ String E_DESCRIPTION = "description";
+ String E_GRANT = "grant";
+ String E_GRANT_PERMISSION = "grant-premission";
+ String E_INHERITED = "inherited";
+ String E_LOCK_OBJECT = "lock-object";
+ String E_MODIFY_REVISION_CONTENT = "modify-revision-content";
+ String E_MODIFY_REVISION_METADATA = "modify-revision-metadata";
+ String E_NON_SEARCHABLE_PROPERTY = "non-searchable-property";
+ String E_PRINCIPAL_COLLECTION_SET = "principal-collection-set";
+ String E_PRINCIPAL_PROPERTY = "principal-property";
+ String E_PRINCIPAL_SEARCH_PROPERTY = "principal-search-property";
+ String E_PRINCIPAL_URL = "principal-URL";
+ String E_PRIVILEGE = "privilege";
+ String E_PROPERTY_SEARCH = "property-search";
+ String E_PROTECTED = "protected";
+ String E_READ = "read";
+ String E_READ_ACL = "read-acl";
+ String E_READ_LOCKS = "read-locks";
+ String E_READ_OBJECT = "read-object";
+ String E_READ_REVISION_CONTENT = "read-revision-content";
+ String E_READ_REVISION_METADATA = "read-revision-metadata";
+ String E_REMOVE_OBJECT = "remove-object";
+ String E_REMOVE_REVISION_CONTENT = "remove-revision-content";
+ String E_REMOVE_REVISION_METADATA = "remove-revision-metadata";
+ String E_REQUIRED_PRINCIPAL = "required-principal";
+ String E_REVOKE_PERMISSION = "revoke-premission";
+ String E_SELF = "self";
+ String E_SUBSTRING = "substring";
+ String E_SUPPORTED_PRIVILEGE = "supported-privilege";
+ String E_UNAUTHENTICATED = "unauthenticated";
+ String E_WRITE_ACL = "write-acl";
/** XML Attributes */
/** Constant helpers */
- static String C_HREF_OPEN = "<D:href>";
- static String C_HREF_CLOSE = "</D:href>";
- static String C_SEARCHREQUEST_OPEN = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?><searchrequest xmlns:D=\"DAV:\"><D:basicsearch>";
- static String C_SEARCHREQUEST_CLOSE =
"</D:basicsearch></searchrequest>";
- static String C_SELECT_OPEN = "<D:select>";
- static String C_SELECT_CLOSE = "</D:select>";
- static String C_WHERE_ISPRINCIPAL = "<D:where><" +
Literals.ISPRINCIPAL + " xmlns=\"" + NamespaceCache.SLIDE_URI + "\"/></D:where>";
- static String C_PROP_PRINCIPAL_URL =
"<D:prop><D:href><D:principal-URL/></D:href></D:prop>";
- static String C_LITERAL_OPEN = "<D:literal>";
- static String C_LITERAL_CLOSE = "</D:literal>";
- static String C_PROP_OPEN = "<D:prop>";
- static String C_PROP_OPEN_NS_OPEN = "<D:prop xmlns:Y=\"";
- static String C_PROP_OPEN_NS_CLOSE = "\">";
- static String C_PROP_CLOSE = "</D:prop>";
- static String C_X_PREFIX = "Y:";
- static String C_PROPCONTAINS_OPEN = "<X:propcontains
xmlns:X=\"http://jakarta.apache.org/slide/\";>";
- static String C_PROPCONTAINS_CLOSE = "</X:propcontains>";
- static String C_WHERE_OPEN = "<D:where><D:and>";
- static String C_WHERE_CLOSE = "</D:and></D:where>";
- static String C_FROM_SCOPE_OPEN = "<D:from><D:scope><D:href>";
- static String C_FROM_SCOPE_CLOSE =
"</D:href></D:scope></D:from>";
- static String C_DISPLAYNAME = "displayname";
+ String C_HREF_OPEN = "<D:href>";
+ String C_HREF_CLOSE = "</D:href>";
+ String C_SEARCHREQUEST_OPEN = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?><searchrequest xmlns:D=\"DAV:\"><D:basicsearch>";
+ String C_SEARCHREQUEST_CLOSE = "</D:basicsearch></searchrequest>";
+ String C_SELECT_OPEN = "<D:select>";
+ String C_SELECT_CLOSE = "</D:select>";
+ String C_WHERE_ISPRINCIPAL = "<D:where><" + Literals.ISPRINCIPAL
+ " xmlns=\"" + NamespaceCache.SLIDE_URI + "\"/></D:where>";
+ String C_PROP_PRINCIPAL_URL =
"<D:prop><D:href><D:principal-URL/></D:href></D:prop>";
+ String C_LITERAL_OPEN = "<D:literal>";
+ String C_LITERAL_CLOSE = "</D:literal>";
+ String C_PROP_OPEN = "<D:prop>";
+ String C_PROP_OPEN_NS_OPEN = "<D:prop xmlns:Y=\"";
+ String C_PROP_OPEN_NS_CLOSE = "\">";
+ String C_PROP_CLOSE = "</D:prop>";
+ String C_X_PREFIX = "Y:";
+ String C_PROPCONTAINS_OPEN = "<X:propcontains
xmlns:X=\"http://jakarta.apache.org/slide/\";>";
+ String C_PROPCONTAINS_CLOSE = "</X:propcontains>";
+ String C_WHERE_OPEN = "<D:where><D:and>";
+ String C_WHERE_CLOSE = "</D:and></D:where>";
+ String C_FROM_SCOPE_OPEN = "<D:from><D:scope><D:href>";
+ String C_FROM_SCOPE_CLOSE = "</D:href></D:scope></D:from>";
+ String C_DISPLAYNAME = "displayname";
/* The PRINCIPAL-SEARCH-PROPERTY-SET has to be in the following way:
* C_PRINCIPAL_SEARCH_PROPERTY_SET =
"property1,namespace1,description1/property2,namspace2,description2/";
*/
- static String C_PRINCIPAL_SEARCH_PROPERTY_SET = "displayname,DAV:,Full name/";
+ String C_PRINCIPAL_SEARCH_PROPERTY_SET = "displayname,DAV:,Full name/";
- static String C_SEARCH_PROPERTY_SET_SEPERATOR = "/";
+ String C_SEARCH_PROPERTY_SET_SEPERATOR = "/";
}
1.18 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavConstants.java
Index: WebdavConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavConstants.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WebdavConstants.java 18 Sep 2003 11:01:43 -0000 1.17
+++ WebdavConstants.java 22 Sep 2003 15:48:56 -0000 1.18
@@ -152,7 +152,6 @@
/** Live Properties */
String P_CREATIONDATE = "creationdate";
String P_MODIFICATIONDATE = "modificationdate";
- String P_MODIFICATIONUSER = "modificationuser";
String P_DISPLAYNAME = "displayname";
String P_GETCONTENTLANGUAGE = "getcontentlanguage";
String P_GETCONTENTLENGTH = "getcontentlength";
@@ -166,6 +165,7 @@
String[] WEBDAV_PROPERTIES = new String[] {
P_CREATIONDATE,
+ P_MODIFICATIONDATE,
P_DISPLAYNAME,
P_GETCONTENTLANGUAGE,
P_GETCONTENTLENGTH,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
