inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

MT - simpify tenant deployer service (subsume tenant service)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-02-11 11:53:56 +00:00
parent 1f36c62b18
commit 14ef325e93
13 changed files with 101 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/config/xml/RepoXMLConfigService.java
View File

@@ -46,7 +46,6 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.tenant.TenantDeployer;
import org.alfresco.repo.tenant.TenantDeployerService;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.transaction.TransactionService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -71,7 +70,6 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
private TransactionService transactionService;
private AuthenticationComponent authenticationComponent;
private TenantDeployerService tenantDeployerService;
private TenantService tenantService;
// Internal caches that are clusterable
private SimpleCache<String, ConfigImpl> globalConfigCache;
@@ -95,12 +93,6 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
{
this.tenantDeployerService = tenantDeployerService;
}
public void setTenantService(TenantService tenantService)
{
this.tenantService = tenantService;
}
public void setGlobalConfigCache(SimpleCache<String, ConfigImpl> globalConfigCache)
{
@@ -200,7 +192,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
}
}, AuthenticationUtil.getSystemUserName());
if (tenantService.isEnabled() && (tenantDeployerService != null))
if ((tenantDeployerService != null) && (tenantDeployerService.isEnabled()))
{
tenantDeployerService.deployTenants(this, logger);
tenantDeployerService.register(this);
@@ -220,7 +212,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
}
}, AuthenticationUtil.getSystemUserName());
if (tenantService.isEnabled() && (tenantDeployerService != null))
if ((tenantDeployerService != null) && (tenantDeployerService.isEnabled()))
{
tenantDeployerService.undeployTenants(this, logger);
tenantDeployerService.unregister(this);
@@ -595,6 +587,6 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
// local helper - returns tenant domain (or empty string if default non-tenant)
private String getTenantDomain()
{
return tenantService.getCurrentUserDomain();
return tenantDeployerService.getCurrentUserDomain();
}
}