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

Merged V3.1 to HEAD

Browse Source 
13256: Fix ETHREEOH-1221   Hard-coded use of "admin" username
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13256


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-12 21:48:15 +00:00
parent ae58306cf9
commit 198ebe371e
48 changed files with 461 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/java/org/alfresco/repo/tenant/MultiTAdminServiceImpl.java
View File

@@ -96,10 +96,9 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
private RepositoryExporterService repositoryExporterService;
private ModuleService moduleService;
private SiteAVMBootstrap siteAVMBootstrap;
private List<WorkflowDeployer> workflowDeployers = new ArrayList<WorkflowDeployer>();
private String baseAdminUsername = "admin"; // default for backwards compatibility only - eg. upgrade of existing MT instance (mt-admin-context.xml.sample)
private String baseAdminUsername = null;
/*
* Tenant domain/ids are unique strings that are case-insensitive. Tenant ids must be valid filenames.
@@ -232,6 +231,10 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
protected void checkProperties()
{
if (moduleService == null || siteAVMBootstrap == null || baseAdminUsername == null)
{
logger.warn(WARN_MSG);
}
PropertyCheck.mandatory(this, "NodeService", nodeService);
PropertyCheck.mandatory(this, "DictionaryComponent", dictionaryComponent);
PropertyCheck.mandatory(this, "RepoAdminService", repoAdminService);
@@ -242,22 +245,9 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
PropertyCheck.mandatory(this, "TenantFileContentStore", tenantFileContentStore);
PropertyCheck.mandatory(this, "WorkflowService", workflowService);
PropertyCheck.mandatory(this, "RepositoryExporterService", repositoryExporterService);
// for backwards compatibility only
if (moduleService == null)
{
// default for now
logger.warn(WARN_MSG);
moduleService = (ModuleService)ctx.getBean("moduleService");
}
if (siteAVMBootstrap == null)
{
// default for now
logger.warn(WARN_MSG);
siteAVMBootstrap = (SiteAVMBootstrap)ctx.getBean("siteAVMBootstrap");
}
PropertyCheck.mandatory(this, "siteAVMBootstrap", siteAVMBootstrap);
PropertyCheck.mandatory(this, "moduleService", moduleService);
PropertyCheck.mandatory(this, "baseAdminUsername", baseAdminUsername);
}
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
@@ -1232,6 +1222,16 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
// local helpers
public String getBaseAdminUser()
{
// default for backwards compatibility only - eg. upgrade of existing MT instance (mt-admin-context.xml.sample)
if (baseAdminUsername != null)
{
return baseAdminUsername;
}
return AuthenticationUtil.getAdminUserName();
}
private String getSystemUser(String tenantDomain)
{
return tenantService.getDomainUser(AuthenticationUtil.getSystemUserName(), tenantDomain);
@@ -1239,7 +1239,8 @@ public class MultiTAdminServiceImpl implements TenantAdminService, ApplicationCo
private String getTenantAdminUser(String tenantDomain)
{
return tenantService.getDomainUser(this.baseAdminUsername, tenantDomain);
return tenantService.getDomainUser(getBaseAdminUser(), tenantDomain);
}
private String getTenantGuestUser(String tenantDomain)