Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

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

View File

@@ -78,11 +78,7 @@ public class TestModel
// construct dictionary dao
TenantService tenantService = new SingleTServiceImpl();
// NamespaceDAOImpl namespaceDAO = new NamespaceDAOImpl();
// namespaceDAO.setTenantService(tenantService);
// initNamespaceCaches(namespaceDAO);
DictionaryDAOImpl dictionaryDAO = new DictionaryDAOImpl();
dictionaryDAO.setTenantService(tenantService);
@@ -118,10 +114,4 @@ public class TestModel
SimpleCache<String, DictionaryRegistry> dictionaryCache = new DefaultSimpleCache<String, DictionaryRegistry>();
dictionaryDAO.setDictionaryRegistryCache(dictionaryCache);
}
// private static void initNamespaceCaches(NamespaceDAOImpl namespaceDAO)
// {
// SimpleCache<String, NamespaceRegistry> namespaceCache = new DefaultSimpleCache<String, NamespaceRegistry>();
// namespaceDAO.setNamespaceRegistryCache(namespaceCache);
// }
}