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

59855: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59601: Merged DEV to V4.2-BUG-FIX
         58003: Prevent QNameDAO from being used without a txn (MNT-9806)
         58022: Fix bootstrap sequencing issues related to Content Publishing and Site models
                - I thought I had broken something but it's one of those random bean loading issues that we don't commonly see
                - Pulled models into core model lists so that we know and understand the ordering of the model loading
                - Removed QNameDAO transaction check, just in case (will reapply it with subsequent commit)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 08:07:52 +00:00
parent 79ccf18f85
commit 4119889331
6 changed files with 37 additions and 22 deletions

View File

@@ -79,6 +79,17 @@ public class DbNodeServiceImplTest extends BaseNodeServiceTest
nodeDAO = (NodeDAO) applicationContext.getBean("nodeDAO");
dictionaryService = (DictionaryService) applicationContext.getBean("dictionaryService");
}
/**
* Ensure that transactionless calls are handled
*/
public void testCallWithoutTxn()
{
setComplete();
endTransaction();
nodeService.getAllRootNodes(rootNodeRef.getStoreRef());
}
/**
* Manually trigger the cleanup registry