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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
77153: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74000: ACE-1802 "MT / Cloud Restrict namespace URI of dynamic models."
      ACE-955 "Custom Content Models in Cloud"
      fix build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78011 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 16:03:28 +00:00
parent 3349e56606
commit 1b4155add7
4 changed files with 12 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/test-java/org/alfresco/repo/dictionary/RepoDictionaryDAOTest.java
View File

@@ -85,11 +85,8 @@ public class RepoDictionaryDAOTest extends TestCase
I18NUtil.registerResourceBundle(TEST_RESOURCE_MESSAGES);
// Instantiate Dictionary Service
TenantService tenantService = new SingleTServiceImpl();
// NamespaceDAOImpl namespaceDAO = new NamespaceDAOImpl();
// namespaceDAO.setTenantService(tenantService);
// initNamespaceCaches(namespaceDAO);
TenantService tenantService = new SingleTServiceImpl();
DictionaryDAOImpl dictionaryDAO = new DictionaryDAOImpl();
dictionaryDAO.setTenantService(tenantService);
initDictionaryCaches(dictionaryDAO);
@@ -118,21 +115,11 @@ public class RepoDictionaryDAOTest extends TestCase
SimpleCache<String,DictionaryRegistry> dictionaryCache = new DefaultSimpleCache<String, DictionaryRegistry>(11, getClass().getName() + ".dictionary");
dictionaryDAO.setDictionaryRegistryCache(dictionaryCache);
}
// private void initNamespaceCaches(NamespaceDAOImpl namespaceDAO)
// {
// SimpleCache<String, NamespaceRegistry> namespaceCache = new DefaultSimpleCache<String, NamespaceRegistry>(11, getClass().getName() + ".namespace");
// namespaceDAO.setNamespaceRegistryCache(namespaceCache);
// }
public void testBootstrap()
{
TenantService tenantService = new SingleTServiceImpl();
// NamespaceDAOImpl namespaceDAO = new NamespaceDAOImpl();
// namespaceDAO.setTenantService(tenantService);
// initNamespaceCaches(namespaceDAO);
DictionaryDAOImpl dictionaryDAO = new DictionaryDAOImpl();
dictionaryDAO.setTenantService(tenantService);
initDictionaryCaches(dictionaryDAO);
@@ -416,17 +403,11 @@ public class RepoDictionaryDAOTest extends TestCase
{
// source dictionary
TenantService tenantService = new SingleTServiceImpl();
// NamespaceDAOImpl namespaceDAO = new NamespaceDAOImpl();
// namespaceDAO.setTenantService(tenantService);
// initNamespaceCaches(namespaceDAO);
DictionaryDAOImpl dictionaryDAO = new DictionaryDAOImpl();
dictionaryDAO.setTenantService(tenantService);
initDictionaryCaches(dictionaryDAO);
// destination dictionary
// NamespaceDAOImpl namespaceDAO2 = new NamespaceDAOImpl();
// namespaceDAO2.setTenantService(tenantService);
// initNamespaceCaches(namespaceDAO2);
DictionaryDAOImpl dictionaryDAO2 = new DictionaryDAOImpl();
dictionaryDAO2.setTenantService(tenantService);
initDictionaryCaches(dictionaryDAO2);