From 39642b39a882865e79257ab9bc5cf103e5ea5300 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 23 Nov 2016 19:43:25 +0000 Subject: [PATCH] RM-4399 (Update Alfresco dependency for RM Community to 5.2.b) --- rm-community/pom.xml | 2 +- .../version/ExtendedVersionableAspect.java | 7 +++---- .../version/ExtendedVersionableAspectUnitTest.java | 10 +++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/rm-community/pom.xml b/rm-community/pom.xml index eeea3f147a..5ade81abbe 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -24,7 +24,7 @@ - 5.2.a-EA + 5.2.b-EA ${alfresco.version} diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java index fc3c2a880a..b4c78a1968 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java @@ -34,7 +34,6 @@ import java.util.Map; import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.util.AlfrescoTransactionSupport; import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil; -import org.alfresco.repo.lock.LockUtils; import org.alfresco.repo.node.NodeServicePolicies; import org.alfresco.repo.policy.Behaviour.NotificationFrequency; import org.alfresco.repo.policy.annotation.Behaviour; @@ -151,9 +150,9 @@ public class ExtendedVersionableAspect implements NodeServicePolicies.OnSetNodeT public void onSetNodeType(NodeRef nodeRef, QName oldType, QName newType) { if (isAutoVersionOnTypeChange && - nodeService.exists(nodeRef) && - !LockUtils.isLockedAndReadOnly(nodeRef, lockService) && - nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) && + nodeService.exists(nodeRef) && + !lockService.isLockedAndReadOnly(nodeRef) && + nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY)) { Map versionedNodeRefs = (Map)alfrescoTransactionSupport.getResource(KEY_VERSIONED_NODEREFS); diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java index e06d0f51fd..b2be78c09b 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java @@ -208,7 +208,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel // verify other verify(mockedNodeService).exists(nodeRef); - verify(mockedLockService).getLockStatus(nodeRef); + verify(mockedLockService).isLockedAndReadOnly(nodeRef); // assert the version was not created verify(mockedVersionService, never()).createVersion(eq(nodeRef), any(Map.class)); @@ -247,7 +247,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel // verify other verify(mockedNodeService).exists(nodeRef); - verify(mockedLockService).getLockStatus(nodeRef); + verify(mockedLockService).isLockedAndReadOnly(nodeRef); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE); // assert the version was not created @@ -291,7 +291,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel // verify other verify(mockedNodeService).exists(nodeRef); - verify(mockedLockService).getLockStatus(nodeRef); + verify(mockedLockService).isLockedAndReadOnly(nodeRef); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY); @@ -340,7 +340,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel // verify other verify(mockedNodeService).exists(nodeRef); - verify(mockedLockService).getLockStatus(nodeRef); + verify(mockedLockService).isLockedAndReadOnly(nodeRef); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY); verify(mockedAlfrescoTransactionSupport).getResource(KEY_VERSIONED_NODEREFS); @@ -396,7 +396,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel // verify other verify(mockedNodeService).exists(nodeRef); - verify(mockedLockService).getLockStatus(nodeRef); + verify(mockedLockService).isLockedAndReadOnly(nodeRef); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY); verify(mockedAlfrescoTransactionSupport, times(2)).getResource(KEY_VERSIONED_NODEREFS);