Merged V3.2 to HEAD

17891: Merged DEV_TEMPORARY to V3.2
                  17873: ETHREEOH-3810: WCM - Recursion detector erroring
   18032: Merged V3.1 to V3.2
                 18030: Merged V2.2 to V3.1
                    17683: Merged DEV_TEMPORARY to V2.2 (back-port of fix)
                       17677: ETHREEOH-2778: davfs2 is not working correctly with Alfresco
                    17880: Merged DEV_TEMPORARY to V2.2 (record-only as fix is already applied to 3.1 branch)
                       17845: ETWOTWO-1289: My Web Files (Forms) dashlets: XSS Attck can be made when web project's details has been edited
   18062: Merged DEV_TEMPORARY to V3.2
                 18036: ETHREEOH-1844: Text field (areas) became non-editable if user use navigate-remove combination for repeatable elements on Create Web content based on web form screen
   18205: Merged V3.1 to V3.2 (record-only)
                  *RECORD ONLY* Merged DEV/TEMPORARY to 3.1
                  17837: ETHREEOH-3801: Creating users via the api does not add them to the user store
   18277: Merged DEV_TEMPORARY to V3.2
                  18178: ETHREEOH-3222: ERROR [org.alfresco.webdav.protocol] WebDAV method not implemented - PROPPATCH
   18311: Fix for ETHREEOH-3872: forms32 examples not working
   18317: Remaining fixes to forms samples (ETHREEOH-3872)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2010-01-27 12:13:56 +00:00
parent 2608d5d4e4
commit 3dfdf48af4
6 changed files with 558 additions and 3 deletions

View File

@@ -71,11 +71,17 @@ public class WebDAV
public static final int WEBDAV_SC_MULTI_STATUS = 207;
public static final int WEBDAV_SC_LOCKED = 423;
public static final int WEBDAV_SC_FAILED_DEPENDENCY = 424;
// WebDAV HTTP response code descriptions
public static final String WEBDAV_SC_FAILED_DEPENDENCY_DESC = "Failed Dependency";
// HTTP response code descriptions
public static final String SC_OK_DESC = "OK";
public static final String SC_NOT_FOUND_DESC = "Not Found";
public static final String SC_FORBIDDEN_DESC = "Forbidden";
// HTTP methods
@@ -169,6 +175,9 @@ public class WebDAV
public static final String XML_SUPPORTED_LOCK = "supportedlock";
public static final String XML_TIMEOUT = "timeout";
public static final String XML_WRITE = "write";
public static final String XML_SET = "set";
public static final String XML_REMOVE = "remove";
public static final String XML_ERROR = "error";
// Namespaced versions of payload elements
@@ -202,6 +211,8 @@ public class WebDAV
public static final String XML_NS_SUPPORTED_LOCK = DAV_NS_PREFIX + "supportedlock";
public static final String XML_NS_TIMEOUT = DAV_NS_PREFIX + "timeout";
public static final String XML_NS_WRITE = DAV_NS_PREFIX + "write";
public static final String XML_NS_ERROR = DAV_NS_PREFIX + "error";
public static final String XML_NS_CANNOT_MODIFY_PROTECTED_PROPERTY = DAV_NS_PREFIX + "cannot-modify-protected-property";
public static final String XML_CONTENT_TYPE = "text/xml; charset=UTF-8";