inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV/SWIFT to HEAD

Browse Source 
25960: RepoBM: improve configurability
          - add option to configure base folder path
          - enable params (base urls, threads, base folder path, ...) to be configured via ant build.properties
   25961: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24568: WebDAV - use fileInfo props (instead of nodeRef + getProp(s)) - resolve conflict
      24727: SPP/WebDAV - compile fix (follow-on to r24568)
      24855: BM - WebDAV - fix litmus -> locks -> 7. discover FAIL (fallout from r24568)
             + ran litmus 0.12.1
   25963: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24784: Log stack trace when reporting exception
   25966: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24725: BM - tweak validate (to use read-only txn)
   25968: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24736: BM - getChildByName optimisation (add reverse-lookup for parentAssocs)
   25992: RepoBM: add TPS
          - extend default ant-jmeter report to show approx/rounded test Time & TPS (note: not done for detailed report)
          - comment out detailed report
          - also expose "duration" param in ant build.xml / build.properties
   26035: RepoBM: ALF-6796 - fix perf of report generation (switch from xalan to saxon)
          - also do not fail on error
   26042: RepoBM: update readme (for ALF-6796) + add zip target
   26045: (RECORD ONLY) Merged DEV/BM to DEV/SWIFT (RECORD ONLY) - already resolved for V3.4 & SWIFT
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23613: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
              23601: ALF-5447: It's impossible to save the MS Office 2010 document via webdav.
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23618: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
              23617: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
                 23602: ALF-5517: Webdav "supportedlock" propfind request fails if locking enabled
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23997: Fix ALF-5731: Saving a doc from Office 2003 via WebDAV fails
   26049: RepoBM: add "folder create" unit test
          - ALF-7309 (WebDAV)
          - ALF-7310 (CMIS)
   26147: RepoBM: update WebDAV test
          - add patched sardine (thanks Florian) 
          - adds "getResources(String url, int depth, boolean allProps)"
   26219: RepoBM: test additions & improvements
          - add "itemRename" (document or folder) - for CMIS (ALF-7362) and WebDAV (ALF-7630)
          - update mixed scenario (add "folderCreate" & "itemRename") - for CMIS (ALF-7546) and WebDAV (ALF-7545)
          - cleanup of common code
   26269: RepoBM: fix mixed scenarios (# of threads & weighted distribution)
          - use single thread group and interleave controllers
          - for CMIS (ALF-7546) and WebDAV (ALF-7545)
   26271: (RECORD ONLY) Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT (RECORD-ONLY)
          - NOTE: verified w/ florian
          - NOTE: OpenCMIS and cmis-client-api are already on SWIFT
          - NOTE: cmis-bm has been superceded by repository-bm
   26273: (RECORD ONLY) Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT (RECORD-ONLY)
      24326: OpenCMIS update
   26395: ALF-7755: add "system-build-test" project (and related RepoBM updates)
          - add ability to run "remote" tests (ie. selected *SystemTest)  against embedded Jetty
          - initially run sanity builds test for RepoBM (RepositoryBenchmarkWebDAVSystemTest + RepositoryBenchmarkCMISSystemTest) & also SiteActivitySystemTest
          - RepoBM enhanced to import test data if not present (also added additional testItemDelete unit test)
          - using local copy of Spring 3.0.5 (requires at least 3.0.2) - can be rationalised once rest of Alfresco (ie. 3rd-party libs) moves up to a higher Spring version
   26420: ALF-7755: tweak "system-build-test" for build box
          - also includes minor fixes to RepoBM (+ readme)
   26448: ALF-7755: tweak "system-build-test"
          - for ant scripts (eg. running on build box)
   26457: ALF-7898 - Alfresco Web Services: fix-up broken/regressed tests (WebServiceSuiteSystemTest)
          - revert default url context ... from "contentspaces" -> "alfresco" (broken during merge from ADB LC branch)
          - fix AuthoringServiceSystemTest.testVersionMethods() - when deleting version history
          - fix RepositoryServiceSystemTest.testPropertySetGet() - when creating dynamic model
   26462: ALF-7898 / ALF-7755: add additional 'system' tests
          - effectively runs Alf Web Service build sanity tests (~= WebServiceSuiteSystemTest)
   26478: ALF-7898 / ALF-7755: additional classpath fiddling (to get around limitation on Windows)
          - see also r26093
   26487: Build fix: cut-and-paste formatting issue
   26502: RepoBM: add "itemUpdate" (update props for doc or folder)
          - for CMIS (ALF-7633) - use Alfresco OpenCMIS Extension to update aspect props
          - for WebDAV (ALF-7631) - patch Sardine to allow custom namespaces
   26526: ALF-7755: use temp classpaths
   26528: ALF-7755: comment out for now
          - seems to work locally and on build boxes when run separately, but fails during full build
          - pending further investigation and testing (eg. when bamboo agents become free)
   26567: ALF-7755: remove test-repository-bm since not used
          - was breaking the test classpath (for following tests)
   26571: ALF-7755: re-enable RepoBenchmarkSystemTestSuite
   26600: ALF-7755: test-system-build-test
          - add user.home (for build box env)
          - re-enable MiscSystemTestSuite (includes Alf WS* tests)
   26609: ALF-7755: fix build/test (RepositoryServiceSystemTest.testPropertySetGet)
          - due to earlier MT test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-06-06 18:31:52 +00:00
parent 2300403bb4
commit 23207fbf7f
6 changed files with 448 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/webdav/GetMethod.java
View File

@@ -29,7 +29,6 @@ import java.util.StringTokenizer;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.extensions.surf.util.I18NUtil;
import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.repo.content.filestore.FileContentReader;
import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.FileInfo;
@@ -40,6 +39,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.repository.datatype.TypeConverter; import org.alfresco.service.cmr.repository.datatype.TypeConverter;
import org.springframework.extensions.surf.util.I18NUtil;
/** /**
* Implements the WebDAV GET method * Implements the WebDAV GET method
@@ -50,8 +50,8 @@ public class GetMethod extends WebDAVMethod
{ {
// Request parameters // Request parameters
private ArrayList ifMatchTags = null; private ArrayList<String> ifMatchTags = null;
private ArrayList ifNoneMatchTags = null; private ArrayList<String> ifNoneMatchTags = null;
private Date m_ifModifiedSince = null; private Date m_ifModifiedSince = null;
private Date m_ifUnModifiedSince = null; private Date m_ifUnModifiedSince = null;
@@ -188,13 +188,12 @@ public class GetMethod extends WebDAVMethod
} }
else else
{ {
NodeRef pathNodeRef = realNodeInfo.getNodeRef();
// Return the node details, and content if requested, check that the node passes the pre-conditions // Return the node details, and content if requested, check that the node passes the pre-conditions
checkPreConditions(realNodeInfo); checkPreConditions(realNodeInfo);
// Build the response header // Build the response header
m_response.setHeader(WebDAV.HEADER_ETAG, getDAVHelper().makeQuotedETag(pathNodeRef)); m_response.setHeader(WebDAV.HEADER_ETAG, getDAVHelper().makeQuotedETag(nodeInfo));
Date modifiedDate = realNodeInfo.getModifiedDate(); Date modifiedDate = realNodeInfo.getModifiedDate();
if (modifiedDate != null) if (modifiedDate != null)
@@ -231,7 +230,7 @@ public class GetMethod extends WebDAVMethod
{ {
// Make an etag for the node // Make an etag for the node
String strETag = getDAVHelper().makeQuotedETag(nodeInfo.getNodeRef()); String strETag = getDAVHelper().makeQuotedETag(nodeInfo);
TypeConverter typeConv = DefaultTypeConverter.INSTANCE; TypeConverter typeConv = DefaultTypeConverter.INSTANCE;
// Check the If-Match header, don't send any content back if none of the tags in // Check the If-Match header, don't send any content back if none of the tags in

11
source/java/org/alfresco/repo/webdav/LockMethod.java
View File

@@ -291,7 +291,7 @@ public class LockMethod extends WebDAVMethod
m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, WebDAV.XML_CONTENT_TYPE); m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, WebDAV.XML_CONTENT_TYPE);
// We either created a new lock or refreshed an existing lock, send back the lock details // We either created a new lock or refreshed an existing lock, send back the lock details
generateResponse(lockNodeInfo.getNodeRef(), userName); generateResponse(lockNodeInfo, userName);
} }
/** /**
@@ -327,6 +327,9 @@ public class LockMethod extends WebDAVMethod
// Lock the node // Lock the node
lockService.lock(lockNode.getNodeRef(), LockType.WRITE_LOCK, getLockTimeout()); lockService.lock(lockNode.getNodeRef(), LockType.WRITE_LOCK, getLockTimeout());
// update local cache (will be read back when generating the response)
lockNode.getProperties().put(ContentModel.PROP_LOCK_OWNER, userName);
//this.lockInfo.setToken(lockToken); //this.lockInfo.setToken(lockToken);
getNodeService().setProperty(lockNode.getNodeRef(), WebDAVModel.PROP_OPAQUE_LOCK_TOKEN, lockToken); getNodeService().setProperty(lockNode.getNodeRef(), WebDAVModel.PROP_OPAQUE_LOCK_TOKEN, lockToken);
} }
@@ -366,7 +369,7 @@ public class LockMethod extends WebDAVMethod
/** /**
* Generates the XML lock discovery response body * Generates the XML lock discovery response body
*/ */
protected void generateResponse(NodeRef lockNode, String userName) throws Exception protected void generateResponse(FileInfo lockNodeInfo, String userName) throws Exception
{ {
String scope; String scope;
String lt; String lt;
@@ -384,7 +387,7 @@ public class LockMethod extends WebDAVMethod
// Output refreshed lock // Output refreshed lock
lt = this.lockInfo.getToken(); lt = this.lockInfo.getToken();
} }
String owner = (String) getNodeService().getProperty(lockNode, ContentModel.PROP_LOCK_OWNER); String owner = (String) lockNodeInfo.getProperties().get(ContentModel.PROP_LOCK_OWNER);
XMLWriter xml = createXMLWriter(); XMLWriter xml = createXMLWriter();
@@ -394,7 +397,7 @@ public class LockMethod extends WebDAVMethod
xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_NS_PROP + nsdec, getDAVHelper().getNullAttributes()); xml.startElement(WebDAV.DAV_NS, WebDAV.XML_PROP + nsdec, WebDAV.XML_NS_PROP + nsdec, getDAVHelper().getNullAttributes());
// Output the lock details // Output the lock details
generateLockDiscoveryXML(xml, lockNode, false, scope, WebDAV.getDepthName(m_depth), lt, owner); generateLockDiscoveryXML(xml, lockNodeInfo, false, scope, WebDAV.getDepthName(m_depth), lt, owner);
// Close off the XML // Close off the XML
xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP); xml.endElement(WebDAV.DAV_NS, WebDAV.XML_PROP, WebDAV.XML_NS_PROP);

41
source/java/org/alfresco/repo/webdav/PropFindMethod.java
View File

@@ -36,7 +36,6 @@ import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException; import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.repository.datatype.TypeConverter; import org.alfresco.service.cmr.repository.datatype.TypeConverter;
@@ -370,7 +369,6 @@ public class PropFindMethod extends WebDAVMethod
*/ */
protected void generateResponseForNode(XMLWriter xml, FileInfo nodeInfo, String path) throws Exception protected void generateResponseForNode(XMLWriter xml, FileInfo nodeInfo, String path) throws Exception
{ {
NodeRef nodeRef = nodeInfo.getNodeRef();
boolean isFolder = nodeInfo.isFolder(); boolean isFolder = nodeInfo.isFolder();
// Output the response block for the current node // Output the response block for the current node
@@ -411,10 +409,10 @@ public class PropFindMethod extends WebDAVMethod
generateNamedPropertiesResponse(xml, nodeInfo, isFolder); generateNamedPropertiesResponse(xml, nodeInfo, isFolder);
break; break;
case GET_ALL_PROPS: case GET_ALL_PROPS:
generateAllPropertiesResponse(xml, nodeRef, isFolder); generateAllPropertiesResponse(xml, nodeInfo, isFolder);
break; break;
case FIND_PROPS: case FIND_PROPS:
generateFindPropertiesResponse(xml, nodeRef, isFolder); generateFindPropertiesResponse(xml, nodeInfo, isFolder);
break; break;
} }
@@ -432,10 +430,8 @@ public class PropFindMethod extends WebDAVMethod
*/ */
private void generateNamedPropertiesResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir) throws Exception private void generateNamedPropertiesResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir) throws Exception
{ {
NodeRef nodeRef = nodeInfo.getNodeRef();
// Get the properties for the node // Get the properties for the node
Map<QName, Serializable> props = getNodeService().getProperties(nodeRef); Map<QName, Serializable> props = nodeInfo.getProperties();
// Output the start of the properties element // Output the start of the properties element
Attributes nullAttr = getDAVHelper().getNullAttributes(); Attributes nullAttr = getDAVHelper().getNullAttributes();
@@ -454,7 +450,6 @@ public class PropFindMethod extends WebDAVMethod
String propName = property.getName(); String propName = property.getName();
String propNamespaceUri = property.getNamespaceUri(); String propNamespaceUri = property.getNamespaceUri();
// String propNamespaceName = property.getNamespaceName();
// Check if the property is a standard WebDAV property // Check if the property is a standard WebDAV property
@@ -465,7 +460,7 @@ public class PropFindMethod extends WebDAVMethod
// Check if the client is requesting lock information // Check if the client is requesting lock information
if (propName.equals(WebDAV.XML_LOCK_DISCOVERY)) // && metaData.isLocked()) if (propName.equals(WebDAV.XML_LOCK_DISCOVERY)) // && metaData.isLocked())
{ {
generateLockDiscoveryResponse(xml, nodeRef, isDir); generateLockDiscoveryResponse(xml, nodeInfo, isDir);
} }
else if (propName.equals(WebDAV.XML_SUPPORTED_LOCK)) else if (propName.equals(WebDAV.XML_SUPPORTED_LOCK))
{ {
@@ -489,7 +484,7 @@ public class PropFindMethod extends WebDAVMethod
else if (propName.equals(WebDAV.XML_DISPLAYNAME)) else if (propName.equals(WebDAV.XML_DISPLAYNAME))
{ {
// Get the node name // Get the node name
if (getRootNodeRef().equals(nodeRef)) if (getRootNodeRef().equals(nodeInfo.getNodeRef()))
{ {
// Output an empty name for the root node // Output an empty name for the root node
xml.write(DocumentHelper.createElement(WebDAV.XML_NS_SOURCE)); xml.write(DocumentHelper.createElement(WebDAV.XML_NS_SOURCE));
@@ -506,7 +501,7 @@ public class PropFindMethod extends WebDAVMethod
String name = typeConv.convert(String.class, davValue); String name = typeConv.convert(String.class, davValue);
if (name == null || name.length() == 0) if (name == null || name.length() == 0)
{ {
logger.error("WebDAV name is null, value=" + davValue.getClass().getName() + ", node=" + nodeRef); logger.error("WebDAV name is null, value=" + davValue.getClass().getName() + ", node=" + nodeInfo.getNodeRef());
} }
xml.write(name); xml.write(name);
} }
@@ -563,7 +558,7 @@ public class PropFindMethod extends WebDAVMethod
// Output the etag // Output the etag
xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG, nullAttr); xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG, nullAttr);
xml.write(getDAVHelper().makeETag(nodeRef)); xml.write(getDAVHelper().makeETag(nodeInfo));
xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG); xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG);
} }
else if (propName.equals(WebDAV.XML_GET_CONTENT_LENGTH)) else if (propName.equals(WebDAV.XML_GET_CONTENT_LENGTH))
@@ -618,9 +613,9 @@ public class PropFindMethod extends WebDAVMethod
// Look in the custom properties // Look in the custom properties
// TODO: Custom properties lookup // TODO: Custom properties lookup
// String qualifiedName = propNamespaceUri + WebDAV.NAMESPACE_SEPARATOR + propName; // String qualifiedName = propNamespaceUri + WebDAV.NAMESPACE_SEPARATOR + propName;
String value = (String) getNodeService().getProperty(nodeRef, property.createQName()); String value = (String) nodeInfo.getProperties().get(property.createQName());
if (value == null) if (value == null)
{ {
propertiesNotFound.add(property); propertiesNotFound.add(property);
@@ -699,11 +694,11 @@ public class PropFindMethod extends WebDAVMethod
* @param node NodeRef * @param node NodeRef
* @param isDir boolean * @param isDir boolean
*/ */
protected void generateAllPropertiesResponse(XMLWriter xml, NodeRef node, boolean isDir) throws Exception protected void generateAllPropertiesResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir) throws Exception
{ {
// Get the properties for the node // Get the properties for the node
Map<QName, Serializable> props = getNodeService().getProperties(node); Map<QName, Serializable> props = nodeInfo.getProperties();
// Output the start of the properties element // Output the start of the properties element
@@ -714,7 +709,7 @@ public class PropFindMethod extends WebDAVMethod
// Generate a lock status report, if locked // Generate a lock status report, if locked
generateLockDiscoveryResponse(xml, node, isDir); generateLockDiscoveryResponse(xml, nodeInfo, isDir);
// Output the supported lock types // Output the supported lock types
@@ -741,7 +736,7 @@ public class PropFindMethod extends WebDAVMethod
String name = typeConv.convert(String.class, davValue); String name = typeConv.convert(String.class, davValue);
if (name == null || name.length() == 0) if (name == null || name.length() == 0)
{ {
logger.error("WebDAV name is null, value=" + davValue.getClass().getName() + ", node=" + node); logger.error("WebDAV name is null, value=" + davValue.getClass().getName() + ", node=" + nodeInfo.getNodeRef());
} }
xml.write(name); xml.write(name);
} }
@@ -801,7 +796,7 @@ public class PropFindMethod extends WebDAVMethod
// Output the etag // Output the etag
xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG, nullAttr); xml.startElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG, nullAttr);
xml.write(getDAVHelper().makeETag(node)); xml.write(getDAVHelper().makeETag(nodeInfo));
xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG); xml.endElement(WebDAV.DAV_NS, WebDAV.XML_GET_ETAG, WebDAV.XML_NS_GET_ETAG);
} }
@@ -850,7 +845,7 @@ public class PropFindMethod extends WebDAVMethod
* @param node NodeRef * @param node NodeRef
* @param isDir boolean * @param isDir boolean
*/ */
protected void generateFindPropertiesResponse(XMLWriter xml, NodeRef node, boolean isDir) protected void generateFindPropertiesResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir)
{ {
try try
{ {
@@ -908,14 +903,14 @@ public class PropFindMethod extends WebDAVMethod
* @param node NodeRef * @param node NodeRef
* @param isDir boolean * @param isDir boolean
*/ */
protected void generateLockDiscoveryResponse(XMLWriter xml, NodeRef node, boolean isDir) throws Exception protected void generateLockDiscoveryResponse(XMLWriter xml, FileInfo nodeInfo, boolean isDir) throws Exception
{ {
// Output the lock status response // Output the lock status response
LockInfo lockInfo = getNodeLockInfo(node); LockInfo lockInfo = getNodeLockInfo(nodeInfo);
if (lockInfo.isLocked()) if (lockInfo.isLocked())
{ {
generateLockDiscoveryXML(xml, node, lockInfo); generateLockDiscoveryXML(xml, nodeInfo, lockInfo);
} }
} }

14
source/java/org/alfresco/repo/webdav/WebDAVHelper.java
View File

@@ -353,24 +353,24 @@ public class WebDAVHelper
/** /**
* Make an ETag value for a node using the GUID and modify date/time * Make an ETag value for a node using the GUID and modify date/time
*/ */
public final String makeETag(NodeRef node) public final String makeETag(FileInfo nodeInfo)
{ {
// Get the modify date/time property for the node // Get the modify date/time property for the node
StringBuilder etag = new StringBuilder(); StringBuilder etag = new StringBuilder();
makeETagString(node, etag); makeETagString(nodeInfo, etag);
return etag.toString(); return etag.toString();
} }
/** /**
* Make an ETag value for a node using the GUID and modify date/time * Make an ETag value for a node using the GUID and modify date/time
*/ */
public final String makeQuotedETag(NodeRef node) public final String makeQuotedETag(FileInfo nodeInfo)
{ {
StringBuilder etag = new StringBuilder(); StringBuilder etag = new StringBuilder();
etag.append("\""); etag.append("\"");
makeETagString(node, etag); makeETagString(nodeInfo, etag);
etag.append("\""); etag.append("\"");
return etag.toString(); return etag.toString();
} }
@@ -378,13 +378,13 @@ public class WebDAVHelper
/** /**
* Make an ETag value for a node using the GUID and modify date/time * Make an ETag value for a node using the GUID and modify date/time
*/ */
protected final void makeETagString(NodeRef node, StringBuilder etag) protected final void makeETagString(FileInfo nodeInfo, StringBuilder etag)
{ {
// Get the modify date/time property for the node // Get the modify date/time property for the node
Object modVal = getNodeService().getProperty(node, ContentModel.PROP_MODIFIED); Object modVal = nodeInfo.getProperties().get(ContentModel.PROP_MODIFIED);
etag.append(node.getId()); etag.append(nodeInfo.getNodeRef().getId());
if ( modVal != null) if ( modVal != null)
{ {

39
source/java/org/alfresco/repo/webdav/WebDAVMethod.java
View File

@@ -737,10 +737,10 @@ public abstract class WebDAVMethod
* @param xml XMLWriter * @param xml XMLWriter
* @param lockNode NodeRef * @param lockNode NodeRef
*/ */
protected void generateLockDiscoveryXML(XMLWriter xml, NodeRef lockNode, LockInfo lockInfo) throws Exception protected void generateLockDiscoveryXML(XMLWriter xml, FileInfo lockNodeInfo, LockInfo lockInfo) throws Exception
{ {
String owner = (String) getNodeService().getProperty(lockNode, ContentModel.PROP_LOCK_OWNER); String owner = (String) lockNodeInfo.getProperties().get(ContentModel.PROP_LOCK_OWNER);
generateLockDiscoveryXML(xml, lockNode, false, lockInfo.getScope(), lockInfo.getDepth(), WebDAV.makeLockToken(lockNode, owner), owner); generateLockDiscoveryXML(xml, lockNodeInfo, false, lockInfo.getScope(), lockInfo.getDepth(), WebDAV.makeLockToken(lockNodeInfo.getNodeRef(), owner), owner);
} }
/** /**
@@ -755,18 +755,14 @@ public abstract class WebDAVMethod
* @param owner String lock owner * @param owner String lock owner
* *
*/ */
protected void generateLockDiscoveryXML(XMLWriter xml, NodeRef lockNode, boolean emptyNamespace, String scope, String depth, String lToken, String owner) throws Exception protected void generateLockDiscoveryXML(XMLWriter xml, FileInfo lockNodeInfo, boolean emptyNamespace, String scope, String depth, String lToken, String owner) throws Exception
{ {
Attributes nullAttr= getDAVHelper().getNullAttributes(); Attributes nullAttr= getDAVHelper().getNullAttributes();
String ns = emptyNamespace ? "" : WebDAV.DAV_NS; String ns = emptyNamespace ? "" : WebDAV.DAV_NS;
if (lockNode != null) if (lockNodeInfo != null)
{ {
// Get the lock details // Get the lock details
Date expiryDate = (Date) lockNodeInfo.getProperties().get(ContentModel.PROP_EXPIRY_DATE);
NodeService nodeService = getNodeService();
Date expiryDate = (Date) nodeService.getProperty(lockNode, ContentModel.PROP_EXPIRY_DATE);
// Output the XML response // Output the XML response
@@ -864,8 +860,8 @@ public abstract class WebDAVMethod
*/ */
protected LockInfo checkNode(FileInfo fileInfo, boolean ignoreShared, boolean lockMethod) throws WebDAVServerException protected LockInfo checkNode(FileInfo fileInfo, boolean ignoreShared, boolean lockMethod) throws WebDAVServerException
{ {
LockInfo nodeLockInfo = getNodeLockInfo(fileInfo.getNodeRef()); LockInfo nodeLockInfo = getNodeLockInfo(fileInfo);
String nodeETag = getDAVHelper().makeQuotedETag(fileInfo.getNodeRef()); String nodeETag = getDAVHelper().makeQuotedETag(fileInfo);
if (m_conditions == null) if (m_conditions == null)
@@ -1055,25 +1051,25 @@ public abstract class WebDAVMethod
* @param fileInfo node * @param fileInfo node
* @return String Lock token * @return String Lock token
*/ */
protected LockInfo getNodeLockInfo(NodeRef nodeRef) protected LockInfo getNodeLockInfo(FileInfo nodeInfo)
{ {
LockInfo lockInfo = new LockInfo(); LockInfo lockInfo = new LockInfo();
NodeService nodeService = getNodeService(); NodeService nodeService = getNodeService();
LockService lockService = getLockService(); LockService lockService = getLockService();
// Check if node is locked directly. // Check if node is locked directly.
LockStatus lockSts = lockService.getLockStatus(nodeRef); LockStatus lockSts = lockService.getLockStatus(nodeInfo.getNodeRef());
if (lockSts == LockStatus.LOCKED || lockSts == LockStatus.LOCK_OWNER) if (lockSts == LockStatus.LOCKED || lockSts == LockStatus.LOCK_OWNER)
{ {
String propOpaqueLockToken = (String) nodeService.getProperty(nodeRef, WebDAVModel.PROP_OPAQUE_LOCK_TOKEN); String propOpaqueLockToken = (String) nodeInfo.getProperties().get(WebDAVModel.PROP_OPAQUE_LOCK_TOKEN);
if (propOpaqueLockToken != null) if (propOpaqueLockToken != null)
{ {
// Get lock depth // Get lock depth
String depth = (String) nodeService.getProperty(nodeRef, WebDAVModel.PROP_LOCK_DEPTH); String depth = (String) nodeInfo.getProperties().get(WebDAVModel.PROP_LOCK_DEPTH);
//Get lock scope //Get lock scope
String scope = (String) nodeService.getProperty(nodeRef, WebDAVModel.PROP_LOCK_SCOPE); String scope = (String) nodeInfo.getProperties().get(WebDAVModel.PROP_LOCK_SCOPE);
// Get shared lock tokens // Get shared lock tokens
String sharedLocks = (String) nodeService.getProperty(nodeRef, WebDAVModel.PROP_SHARED_LOCK_TOKENS); String sharedLocks = (String) nodeInfo.getProperties().get(WebDAVModel.PROP_SHARED_LOCK_TOKENS);
// Node has it's own Lock token. // Node has it's own Lock token.
// Store lock information to the lockInfo object // Store lock information to the lockInfo object
@@ -1088,13 +1084,13 @@ public abstract class WebDAVMethod
else else
{ {
// No has no exclusive lock but can be locked with shared lock // No has no exclusive lock but can be locked with shared lock
String sharedLocks = (String) nodeService.getProperty(nodeRef, WebDAVModel.PROP_SHARED_LOCK_TOKENS); String sharedLocks = (String) nodeInfo.getProperties().get(WebDAVModel.PROP_SHARED_LOCK_TOKENS);
if (sharedLocks != null) if (sharedLocks != null)
{ {
// Get lock depth // Get lock depth
String depth = (String) nodeService.getProperty(nodeRef, WebDAVModel.PROP_LOCK_DEPTH); String depth = (String) nodeInfo.getProperties().get(WebDAVModel.PROP_LOCK_DEPTH);
//Get lock scope //Get lock scope
String scope = (String) nodeService.getProperty(nodeRef, WebDAVModel.PROP_LOCK_SCOPE); String scope = (String) nodeInfo.getProperties().get(WebDAVModel.PROP_LOCK_SCOPE);
// Node has it's own Lock token. // Node has it's own Lock token.
// Store lock information to the lockInfo object // Store lock information to the lockInfo object
@@ -1110,6 +1106,7 @@ public abstract class WebDAVMethod
// Node isn't locked directly and has no it's own Lock token. // Node isn't locked directly and has no it's own Lock token.
// Try to search indirect lock. // Try to search indirect lock.
NodeRef nodeRef = nodeInfo.getNodeRef();
NodeRef node = nodeRef; NodeRef node = nodeRef;
while (true) while (true)
{ {

12
source/java/org/alfresco/repo/webdav/WebDAVServlet.java
View File

@@ -19,6 +19,8 @@
package org.alfresco.repo.webdav; package org.alfresco.repo.webdav;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Properties; import java.util.Properties;
@@ -137,7 +139,10 @@ public class WebDAVServlet extends HttpServlet
WebDAVServerException error = (WebDAVServerException) e; WebDAVServerException error = (WebDAVServerException) e;
if (error.getCause() != null) if (error.getCause() != null)
{ {
logger.error(INTERNAL_SERVER_ERROR, error.getCause()); StringWriter writer = new StringWriter();
PrintWriter print = new PrintWriter(writer);
error.printStackTrace(print);
logger.error(print.toString(), e);
} }
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
@@ -158,7 +163,10 @@ public class WebDAVServlet extends HttpServlet
} }
else else
{ {
logger.error(INTERNAL_SERVER_ERROR, e); StringWriter writer = new StringWriter();
PrintWriter print = new PrintWriter(writer);
e.printStackTrace(print);
logger.error(print.toString(), e);
if (response.isCommitted()) if (response.isCommitted())
{ {