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 DEV to HEAD

Browse Source 
52232: Introduce filter to select only enabled tenants (ALF-19172)
   52233: Missed file for rev 52232 (ALF-19172)
   52246: MT: Make lowercasing of tenant domain a little more explicit
   52247: MT: Clean up imports, redundant non-Javadoc and add @Override


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-07-09 13:56:14 +00:00
parent b687de2f80
commit 5c06b15604
12 changed files with 839 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1432
source/java/org/alfresco/repo/module/ModuleComponentHelper.java
View File

File diff suppressed because it is too large Load Diff

2
source/java/org/alfresco/repo/module/ModuleComponentHelperTest.java
View File

@@ -145,7 +145,7 @@ public class ModuleComponentHelperTest extends BaseAlfrescoTestCase
int tenantCount = 0;
if (tenantDeployerService.isEnabled())
{
tenantCount = tenantDeployerService.getAllTenants().size();
tenantCount = tenantDeployerService.getTenants(true).size();
}
// Check
assertEquals(

8
source/java/org/alfresco/repo/module/ModuleServiceImpl.java
View File

@@ -27,10 +27,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.TreeMap;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.admin.registry.RegistryKey;
import org.alfresco.repo.admin.registry.RegistryService;
import org.alfresco.repo.tenant.TenantAdminService;
import org.alfresco.service.ServiceRegistry;
@@ -46,7 +44,6 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.extensions.surf.util.I18NUtil;
/**
* This component controls the execution of
@@ -118,10 +115,7 @@ public class ModuleServiceImpl implements ApplicationContextAware, ModuleService
this.moduleComponentHelper.setApplyToTenants(applyToTenants);
}
/* (non-Javadoc)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
*/
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
this.resolver = applicationContext;