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

@@ -28,7 +28,6 @@ import org.alfresco.repo.cache.NullCache;
import org.alfresco.repo.dictionary.DictionaryBootstrap;
import org.alfresco.repo.dictionary.DictionaryComponent;
import org.alfresco.repo.dictionary.DictionaryDAOImpl;
import org.alfresco.repo.dictionary.NamespaceDAOImpl;
import org.alfresco.repo.tenant.SingleTServiceImpl;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.namespace.QName;
@@ -57,9 +56,6 @@ public class PolicyComponentTest extends TestCase
{
// Instantiate Dictionary Service
TenantService tenantService = new SingleTServiceImpl();
// NamespaceDAOImpl namespaceDAO = new NamespaceDAOImpl();
// namespaceDAO.setTenantService(tenantService);
// initNamespaceCaches(namespaceDAO);
DictionaryDAOImpl dictionaryDAO = new DictionaryDAOImpl();
dictionaryDAO.setTenantService(tenantService);
initDictionaryCaches(dictionaryDAO);
@@ -87,13 +83,6 @@ public class PolicyComponentTest extends TestCase
// note: unit tested here with null cache
dictionaryDAO.setDictionaryRegistryCache(new NullCache());
}
// @SuppressWarnings("unchecked")
// private void initNamespaceCaches(NamespaceDAOImpl namespaceDAO)
// {
// // note: unit tested here with null cache
// namespaceDAO.setNamespaceRegistryCache(new NullCache());
// }
public void testJavaBehaviour()
{