diff --git a/config/alfresco/content-publishing-context.xml b/config/alfresco/content-publishing-context.xml index c90e98088d..784e7fe281 100644 --- a/config/alfresco/content-publishing-context.xml +++ b/config/alfresco/content-publishing-context.xml @@ -2,13 +2,6 @@ - - - - alfresco/model/publishingModel.xml - - - diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml index 3938582c2d..6270d63e22 100644 --- a/config/alfresco/core-services-context.xml +++ b/config/alfresco/core-services-context.xml @@ -821,6 +821,12 @@ alfresco/model/shareUiModel.xml + + + alfresco/model/siteModel.xml + + + alfresco/model/publishingModel.xml @@ -836,6 +842,7 @@ alfresco/messages/transfer-model alfresco/messages/wcmapp-model alfresco/messages/publishing-model + alfresco/messages/site-model diff --git a/config/alfresco/dao/dao-context.xml b/config/alfresco/dao/dao-context.xml index 6413b106da..ba566a5ddd 100644 --- a/config/alfresco/dao/dao-context.xml +++ b/config/alfresco/dao/dao-context.xml @@ -81,7 +81,21 @@ - + + + qnameDAOImpl + + + + org.alfresco.repo.domain.qname.QNameDAO + + + + + + + + diff --git a/config/alfresco/site-services-context.xml b/config/alfresco/site-services-context.xml index bfa78d0e92..06f6ab20f9 100644 --- a/config/alfresco/site-services-context.xml +++ b/config/alfresco/site-services-context.xml @@ -3,20 +3,6 @@ - - - - alfresco/model/siteModel.xml - - - - - - alfresco/messages/site-model - - - - diff --git a/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java b/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java index c83c90d716..d9f2fe4afd 100644 --- a/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java +++ b/source/test-java/org/alfresco/repo/node/BaseNodeServiceTest.java @@ -1094,6 +1094,8 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest setComplete(); endTransaction(); + startNewTransaction(); + assertFalse("n6 not directly deleted", nodeService.exists(n6Ref)); assertFalse("n8 not cascade deleted", nodeService.exists(n8Ref)); assertEquals("n6 primary parent association not removed from n3", 0, countChildrenOfNode(n3Ref)); @@ -1845,6 +1847,8 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest setComplete(); endTransaction(); + startNewTransaction(); + // get the properties back Map checkProperties = nodeService.getProperties(nodeRef); checkProperty = checkProperties.get(PROP_QNAME_ENCRYPTED_VALUE); diff --git a/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java b/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java index c6af17892c..7bd9c2325b 100644 --- a/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/node/db/DbNodeServiceImplTest.java @@ -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