inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-4399 (Update Alfresco dependency for RM Community to 5.2.b)

Browse Source
This commit is contained in:
Tuna Aksoy
2016-11-23 19:43:25 +00:00
parent 5b055daff3
commit 39642b39a8
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/pom.xml
View File

@@ -24,7 +24,7 @@
</modules> </modules>
<properties> <properties>
<alfresco.version>5.2.a-EA</alfresco.version> <alfresco.version>5.2.b-EA</alfresco.version>
<share.version>${alfresco.version}</share.version> <share.version>${alfresco.version}</share.version>
</properties> </properties>
</project> </project>

3
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java
View File

@@ -34,7 +34,6 @@ import java.util.Map;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.util.AlfrescoTransactionSupport; import org.alfresco.module.org_alfresco_module_rm.util.AlfrescoTransactionSupport;
import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil; 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.node.NodeServicePolicies;
import org.alfresco.repo.policy.Behaviour.NotificationFrequency; import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
import org.alfresco.repo.policy.annotation.Behaviour; import org.alfresco.repo.policy.annotation.Behaviour;
@@ -152,7 +151,7 @@ public class ExtendedVersionableAspect implements NodeServicePolicies.OnSetNodeT
{ {
if (isAutoVersionOnTypeChange && if (isAutoVersionOnTypeChange &&
nodeService.exists(nodeRef) && nodeService.exists(nodeRef) &&
!LockUtils.isLockedAndReadOnly(nodeRef, lockService) && !lockService.isLockedAndReadOnly(nodeRef) &&
nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) && nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) &&
!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY)) !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY))
{ {

10
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspectUnitTest.java
View File

@@ -208,7 +208,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel
// verify other // verify other
verify(mockedNodeService).exists(nodeRef); verify(mockedNodeService).exists(nodeRef);
verify(mockedLockService).getLockStatus(nodeRef); verify(mockedLockService).isLockedAndReadOnly(nodeRef);
// assert the version was not created // assert the version was not created
verify(mockedVersionService, never()).createVersion(eq(nodeRef), any(Map.class)); verify(mockedVersionService, never()).createVersion(eq(nodeRef), any(Map.class));
@@ -247,7 +247,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel
// verify other // verify other
verify(mockedNodeService).exists(nodeRef); 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_VERSIONABLE);
// assert the version was not created // assert the version was not created
@@ -291,7 +291,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel
// verify other // verify other
verify(mockedNodeService).exists(nodeRef); 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_VERSIONABLE);
verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY);
@@ -340,7 +340,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel
// verify other // verify other
verify(mockedNodeService).exists(nodeRef); 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_VERSIONABLE);
verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY);
verify(mockedAlfrescoTransactionSupport).getResource(KEY_VERSIONED_NODEREFS); verify(mockedAlfrescoTransactionSupport).getResource(KEY_VERSIONED_NODEREFS);
@@ -396,7 +396,7 @@ public class ExtendedVersionableAspectUnitTest implements RecordsManagementModel
// verify other // verify other
verify(mockedNodeService).exists(nodeRef); 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_VERSIONABLE);
verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY); verify(mockedNodeService).hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY);
verify(mockedAlfrescoTransactionSupport, times(2)).getResource(KEY_VERSIONED_NODEREFS); verify(mockedAlfrescoTransactionSupport, times(2)).getResource(KEY_VERSIONED_NODEREFS);