From 7f1c0c42c70b4159f5b55e80f42ea440bee59bfd Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Fri, 22 Nov 2013 17:22:28 +0000 Subject: [PATCH] CLOUD-2198: restored posting of activities from Sharepoint. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@58179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/webdav/WebDAVHelper.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java index ebe1697eaf..963c09dccd 100644 --- a/source/java/org/alfresco/repo/webdav/WebDAVHelper.java +++ b/source/java/org/alfresco/repo/webdav/WebDAVHelper.java @@ -784,16 +784,21 @@ public class WebDAVHelper } public String determineSiteId(WebDAVMethod method) + { + return determineSiteId(method.getRootNodeRef(), method.getPath()); + } + + public String determineSiteId(NodeRef rootNodeRef, String path) { SiteService siteService = getServiceRegistry().getSiteService(); String siteId; try { - FileInfo fileInfo = getNodeForPath(method.getRootNodeRef(), method.getPath()); + FileInfo fileInfo = getNodeForPath(rootNodeRef, path); siteId = siteService.getSiteShortName(fileInfo.getNodeRef()); if (siteId == null) { - throw new RuntimeException("Node is not contained by a site: " + method.getPath()); + throw new RuntimeException("Node is not contained by a site: " + path); } } catch (Exception error) @@ -803,7 +808,13 @@ public class WebDAVHelper return siteId; } + @Deprecated public String determineTenantDomain(WebDAVMethod method) + { + return determineTenantDomain(); + } + + public String determineTenantDomain() { TenantService tenantService = getTenantService(); String tenantDomain = tenantService.getCurrentUserDomain();