Merged DEV/TEMPORARY to HEAD (pending review comments)

22072: ALF-3707: Alfresco Sharepoint protocol and Office 2010 issue
      The following was added to support Office 2010:
      - Specific HTTP headers were added. 
      - Server version headers and server version method were changed.
      - WebDAV LOCK method was changed to support inheritance.
      - VTI LOCK and UNLOCK methods were implemented.
      - VtiWebDavAction was added to support WebDAV methods extension.
      - VtiLock and VtiUnlock actions were implemented.
      - IfHeaderAction was extended to support new requests.
      - CheckOutFile service was implemented.
      - CheckInFile service was implemented.
      - UndoCheckOutFile service was implemented. 
      - VtiMethodHandler was extended to support work with Working Copy.
      - CheckOutCheckInServiceHandler was added to support appropriate endpoints.
      - VtiRequestDispatcher was extended to provide additional dispatching.
      - Configuration was extended to support new FrontPage methods and web services.
      - Some unused fields and config values were removed.
   22922: ALF-4817: Can't use Sharepoint module with Windows 7 - locking not implemented
      Implemented and Tested Open, Save, CheckOut, CheckIn and cancel checkOut operations on following environment:
      Win Vista: Office 2003, Office 2007
      Win XP: Office 2003, Office 2007, Office 2010
      Win 7: Office 2007


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-10-11 18:09:07 +00:00
parent 798b711aff
commit e6fd1db528
2 changed files with 11 additions and 9 deletions

View File

@@ -47,13 +47,13 @@ public class LockMethod extends WebDAVMethod
{ {
public static final String EMPTY_NS = ""; public static final String EMPTY_NS = "";
private int m_timeoutDuration = WebDAV.TIMEOUT_INFINITY; protected int m_timeoutDuration = WebDAV.TIMEOUT_INFINITY;
private LockInfo lockInfo = new LockInfo(); protected LockInfo lockInfo = new LockInfo();
private boolean createExclusive; protected boolean createExclusive;
private String lockToken= null; protected String lockToken= null;
/** /**
* Default constructor * Default constructor
@@ -338,7 +338,7 @@ public class LockMethod extends WebDAVMethod
* @param userName String * @param userName String
* @exception WebDAVServerException * @exception WebDAVServerException
*/ */
private final void refreshLock(FileInfo lockNode, String userName) throws WebDAVServerException protected final void refreshLock(FileInfo lockNode, String userName) throws WebDAVServerException
{ {
if (this.createExclusive) if (this.createExclusive)
{ {
@@ -350,7 +350,7 @@ public class LockMethod extends WebDAVMethod
/** /**
* Generates the XML lock discovery response body * Generates the XML lock discovery response body
*/ */
private void generateResponse(NodeRef lockNode, String userName) throws Exception protected void generateResponse(NodeRef lockNode, String userName) throws Exception
{ {
String scope; String scope;
String lt; String lt;
@@ -413,6 +413,8 @@ public class LockMethod extends WebDAVMethod
ns.append(" "); ns.append(" ");
ns.append(WebDAV.XML_NS); ns.append(WebDAV.XML_NS);
ns.append(":");
ns.append(WebDAV.DAV_NS);
ns.append("=\""); ns.append("=\"");
ns.append(WebDAV.DEFAULT_NAMESPACE_URI); ns.append(WebDAV.DEFAULT_NAMESPACE_URI);
ns.append("\""); ns.append("\"");

View File

@@ -354,10 +354,10 @@ public class PropPatchMethod extends PropFindMethod
* *
* @author Ivan Rybnikov * @author Ivan Rybnikov
*/ */
private class PropertyAction protected class PropertyAction
{ {
protected static final int SET = 0; public static final int SET = 0;
protected static final int REMOVE = 1; public static final int REMOVE = 1;
// Property on which action should be performed // Property on which action should be performed
private WebDAVProperty property; private WebDAVProperty property;