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

Multi-Tenant node interceptor

Browse Source 
- Actually less happening here than it would first appear
 - Some MT bean and interface consolidation
 - The unit test has no meat to it, yet... coming soon!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-09-05 13:04:46 +00:00
parent f074588b0c
commit 77eb167c2b
35 changed files with 961 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,8 @@ import org.alfresco.repo.cache.SimpleCache;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.tenant.TenantAdminService;
import org.alfresco.repo.tenant.TenantDeployer;
import org.alfresco.repo.tenant.TenantDeployerService;
import org.alfresco.service.transaction.TransactionService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -69,7 +69,7 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
// Dependencies
private TransactionService transactionService;
private AuthenticationComponent authenticationComponent;
private TenantDeployerService tenantDeployerService;
private TenantAdminService tenantAdminService;
// Internal caches that are clusterable
private SimpleCache<String, ConfigImpl> globalConfigCache;
@@ -89,9 +89,9 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
this.authenticationComponent = authenticationComponent;
}
public void setTenantDeployerService(TenantDeployerService tenantDeployerService)
public void setTenantAdminService(TenantAdminService tenantAdminService)
{
this.tenantDeployerService = tenantDeployerService;
this.tenantAdminService = tenantAdminService;
}
public void setGlobalConfigCache(SimpleCache<String, ConfigImpl> globalConfigCache)
@@ -192,10 +192,10 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
}
}, AuthenticationUtil.getSystemUserName());
if ((tenantDeployerService != null) && (tenantDeployerService.isEnabled()))
if ((tenantAdminService != null) && (tenantAdminService.isEnabled()))
{
tenantDeployerService.deployTenants(this, logger);
tenantDeployerService.register(this);
tenantAdminService.deployTenants(this, logger);
tenantAdminService.register(this);
}
}
@@ -573,6 +573,6 @@ public class RepoXMLConfigService extends XMLConfigService implements TenantDepl
// local helper - returns tenant domain (or empty string if default non-tenant)
private String getTenantDomain()
{
return tenantDeployerService.getCurrentUserDomain();
return tenantAdminService.getCurrentUserDomain();
}
}