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

ALF-13441: WebDAV: activities should be raised/published

Browse Source 
Moved siteId and tenantDomain discover to peer object to allow overriding of behaviour where needed (e.g. Cloud)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-03-26 15:44:39 +00:00
parent 603877a9ad
commit 8021e13f29
2 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1520,27 +1520,7 @@ public abstract class WebDAVMethod
{
if (siteId == null)
{
siteId = determineSiteId();
}
return siteId;
}
protected String determineSiteId()
{
SiteService siteService = m_davHelper.getServiceRegistry().getSiteService();
String siteId;
try
{
FileInfo fileInfo = m_davHelper.getNodeForPath(
getRootNodeRef(),
getPath(),
m_request.getServletPath());
SiteInfo siteInfo = siteService.getSite(fileInfo.getNodeRef());
siteId = siteInfo.getShortName();
}
catch (FileNotFoundException error)
{
siteId = DEFAULT_SITE_ID;
siteId = getDAVHelper().determineSiteId(this);
}
return siteId;
}
@@ -1555,18 +1535,7 @@ public abstract class WebDAVMethod
{
if (tenantDomain == null)
{
tenantDomain = determineTenantDomain();
}
return tenantDomain;
}
protected String determineTenantDomain()
{
TenantService tenantService = m_davHelper.getTenantService();
String tenantDomain = tenantService.getCurrentUserDomain();
if (tenantDomain == null)
{
return TenantService.DEFAULT_DOMAIN;
tenantDomain = getDAVHelper().determineTenantDomain(this);
}
return tenantDomain;
}