From eaec3f0fd4171087420e9df88bbf636cae38e946 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Thu, 4 Jun 2020 18:55:56 +0300 Subject: [PATCH 01/42] APPS-139 other code review comments --- .../action/dm/RecordActionUtils.java | 4 + .../DeclareAsVersionRecordActionUnitTest.java | 81 +++++++------------ 2 files changed, 33 insertions(+), 52 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java index bfae201062..3a350b940d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java @@ -41,6 +41,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.util.StringUtils; +/** + * Utility class containing helper methods for record + */ + public class RecordActionUtils { /** diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java index 0610fbd27e..edfef6560e 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java @@ -218,14 +218,8 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest public void noFilePlanParameterNoDefaultFilePlan() { // setup - doReturn(true).when(mockedNodeService).exists(actionedUponNodeRef); - doReturn(true).when(mockedDictionaryService).isSubClass(any(QName.class), eq(ContentModel.TYPE_CONTENT)); - doReturn(true).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD_REJECTION_DETAILS); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_SYNCED); - + setupMockedAspects(); + // no default file plan doReturn(null).when(mockedFilePlanService).getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID); @@ -235,7 +229,7 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest // execute action declareAsVersionRecordAction.executeImpl(mock(Action.class), actionedUponNodeRef); } - + /** * Given that no file plan is provided * And a default file plan exists @@ -246,13 +240,7 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest public void noFilePlanParameterDefaultFilePlan() { // setup - doReturn(true).when(mockedNodeService).exists(actionedUponNodeRef); - doReturn(true).when(mockedDictionaryService).isSubClass(any(QName.class), eq(ContentModel.TYPE_CONTENT)); - doReturn(true).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD_REJECTION_DETAILS); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_SYNCED); + setupMockedAspects(); // no default file plan doReturn(filePlan).when(mockedFilePlanService).getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID); @@ -261,7 +249,7 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest declareAsVersionRecordAction.executeImpl(mock(Action.class), actionedUponNodeRef); verify(mockedRecordableVersionService, times(1)).createRecordFromLatestVersion(filePlan, actionedUponNodeRef); } - + /** * Given that a file plan is provided * And it isn't a file plan @@ -272,14 +260,8 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest public void invalidFilePlanParameter() { // setup - doReturn(true).when(mockedNodeService).exists(actionedUponNodeRef); - doReturn(true).when(mockedDictionaryService).isSubClass(any(QName.class), eq(ContentModel.TYPE_CONTENT)); - doReturn(true).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD_REJECTION_DETAILS); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_SYNCED); - + setupMockedAspects(); + // not a file plan is provided in the parameters mockActionParameterValue(DeclareAsVersionRecordAction.PARAM_FILE_PLAN, generateNodeRef()); @@ -300,14 +282,8 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest public void validFilePlanParameter() { // setup - doReturn(true).when(mockedNodeService).exists(actionedUponNodeRef); - doReturn(true).when(mockedDictionaryService).isSubClass(any(QName.class), eq(ContentModel.TYPE_CONTENT)); - doReturn(true).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD_REJECTION_DETAILS); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_SYNCED); - + setupMockedAspects(); + // not a file plan is provided in the parameters NodeRef myFilePlan = generateNodeRef(TYPE_FILE_PLAN); doReturn(true).when(mockedFilePlanService).isFilePlan(myFilePlan); @@ -326,18 +302,14 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest @Test public void validDestinationRecordFolderProvided() { - String childName = GUID.generate(); + String pathParameter = GUID.generate(); // setup - doReturn(true).when(mockedNodeService).exists(actionedUponNodeRef); - doReturn(true).when(mockedDictionaryService).isSubClass(any(QName.class), eq(ContentModel.TYPE_CONTENT)); - doReturn(true).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD_REJECTION_DETAILS); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_SYNCED); + setupMockedAspects(); + + mockActionParameterValue(DeclareAsVersionRecordAction.PARAM_PATH, pathParameter); // provided location - doReturn(destinationRecordFolderNodeRef).when(mockedNodeService).getChildByName(parentDestinationNodeRef, ContentModel.ASSOC_CONTAINS, childName); + doReturn(destinationRecordFolderNodeRef).when(mockedNodeService).getChildByName(filePlan, ContentModel.ASSOC_CONTAINS, pathParameter); doReturn(TYPE_RECORD_FOLDER).when(mockedNodeService).getType(destinationRecordFolderNodeRef); // capability check @@ -347,8 +319,8 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest doReturn(filePlan).when(mockedFilePlanService).getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID); // execute action - declareAsVersionRecordAction.executeImpl(mock(Action.class), actionedUponNodeRef); - verify(mockedRecordableVersionService, times(1)).createRecordFromLatestVersion(filePlan, actionedUponNodeRef); + declareAsVersionRecordAction.executeImpl(getMockedAction(), actionedUponNodeRef); + verify(mockedRecordableVersionService, times(1)).createRecordFromLatestVersion(destinationRecordFolderNodeRef, actionedUponNodeRef); } /** @@ -361,13 +333,7 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest { String childName = GUID.generate(); // setup - doReturn(true).when(mockedNodeService).exists(actionedUponNodeRef); - doReturn(true).when(mockedDictionaryService).isSubClass(any(QName.class), eq(ContentModel.TYPE_CONTENT)); - doReturn(true).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD_REJECTION_DETAILS); - doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_SYNCED); + setupMockedAspects(); // provided location doReturn(destinationRecordFolderNodeRef).when(mockedNodeService).getChildByName(parentDestinationNodeRef, ContentModel.ASSOC_CONTAINS, childName); @@ -380,6 +346,17 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest exception.expect(AlfrescoRuntimeException.class); // execute action - declareAsVersionRecordAction.executeImpl(mock(Action.class), actionedUponNodeRef); + declareAsVersionRecordAction.executeImpl(getMockedAction(), actionedUponNodeRef); + } + + private void setupMockedAspects() + { + doReturn(true).when(mockedNodeService).exists(actionedUponNodeRef); + doReturn(true).when(mockedDictionaryService).isSubClass(any(QName.class), eq(ContentModel.TYPE_CONTENT)); + doReturn(true).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE); + doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD); + doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY); + doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_RECORD_REJECTION_DETAILS); + doReturn(false).when(mockedNodeService).hasAspect(actionedUponNodeRef, ASPECT_SYNCED); } } From fa02dee1de8e0f241108d69e89b548b2b95207b9 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 02/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.txt b/README.txt index 726c5335de..07d9f7ecfa 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index 99ba22c921..79a440a101 100644 --- a/pom.xml +++ b/pom.xml @@ -21,11 +21,11 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - HEAD - + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD + JIRA From 34ad0e5dbea58427493b601f255eaa3682e3f36a Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 03/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.txt b/README.txt index 637a6736fd..0b7096410f 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index 1b1b9995f3..473e03e16c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,11 +21,11 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - HEAD - + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD + JIRA From 68f257c726e3282fdc8df64c7d2c7ff1265cee13 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 04/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.txt b/README.txt index 637a6736fd..0b7096410f 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index 8c62e4ebfc..704f99759a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,11 +21,11 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - HEAD - + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD + JIRA From a8cffa7f85bdb6036a752c8ed10e00b0f1dc8d5e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 05/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.txt b/README.txt index c834ccf83d..0d34840750 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index 174410e56a..e720821e68 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V2.5.2 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD From 314946ce3c694e1e99fc094aa1a9e2d45d184b11 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 06/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.txt b/README.txt index c834ccf83d..0d34840750 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index 37c07218a2..3e1381b2d6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V2.5.3 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD From 2a5f7e23f85eea01f79ac715b020e9b41a698bdf Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 07/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.txt b/README.txt index c834ccf83d..0d34840750 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index d8ad07760c..16580a61c7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V2.5.4 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD From 44327051fd2de8d622bc4574595c44b1e3aefa1f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 08/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.txt b/README.txt index 1d260c7466..5191713f84 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index 673fb733a6..79a42a7d96 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V2.6.0 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index ed79baa2d3..4fe00bda81 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From ba7cfc37a9369b5c324faf97961f633d3171cdb7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 09/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.txt b/README.txt index 1d260c7466..5191713f84 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index 5517a1a903..13108ece93 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V2.6.1 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index ed79baa2d3..4fe00bda81 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From b5206ecb8ad6cf41cd991ebb0d7cd43ee9e19e4a Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 10/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- README.txt | 2 +- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.txt b/README.txt index 1d260c7466..5191713f84 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ Configuring and starting Alfresco/Share: ---------------------------------------- -- Clone the project (e.g. git clone git@gitlab.alfresco.com:records-management/records-management.git) +- Clone the project (e.g. git clone git@github.com:Alfresco/governance-services.git) - Import the project as a maven project diff --git a/pom.xml b/pom.xml index 3bacb45837..4e2103e1cf 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V2.6.2 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index ed79baa2d3..4fe00bda81 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From fc26bb6674805317944f17e0b08278fc6d38453f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 11/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1bfb66b473..b17a557917 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - V2.6.3 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD From 7f4ac57b383a491d41eaf0c18588f2215638e03c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 12/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 8508225b38..b82c8eaff6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V2.7.1 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index d80c026457..c5918e396a 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From c036bc3fadbd799da3fd93de868b799d15c6570f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 13/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b6cdea62fd..1438bba142 100644 --- a/pom.xml +++ b/pom.xml @@ -21,10 +21,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V2.7.2 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index d80c026457..c5918e396a 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From e5b03113b2f476383718aea7062e50ba92332b56 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 14/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 6080de91ad..a8112af457 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V3.0.0 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index d80c026457..c5918e396a 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From 5978aa904a814f11ebb0c53fe8e75d588b1ad99f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 15/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 6 +++--- rm-community/documentation/overview.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5abb8617da..4258888f1c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index d80c026457..c5918e396a 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From 28350722c7ef648be54f16d68462e4bdaf4fdf16 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 16/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 63d55fde35..35e263fbfb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V3.0.2 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index d80c026457..c5918e396a 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From f2be31d8981a9cdbe1ad7676030fcf16f2a87dcd Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 17/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d5d0a9086a..f8e0d971c1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V3.1.0 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index d80c026457..c5918e396a 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From 25bc3a4919144a7d00ba783c169049aa1e8fb547 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 18/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 7822a92528..c3360da001 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V3.2.0 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index d80c026457..c5918e396a 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From 56315592dafd4cd058db5e4308f2d1b46e444a06 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 19/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- rm-community/documentation/overview.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 20a45c4bdf..ed90e70dca 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ - scm:git:https://git.alfresco.com/records-management/records-management.git - scm:git:https://git.alfresco.com/records-management/records-management.git - https://git.alfresco.com/records-management/records-management - V3.3.0 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD diff --git a/rm-community/documentation/overview.md b/rm-community/documentation/overview.md index d80c026457..c5918e396a 100644 --- a/rm-community/documentation/overview.md +++ b/rm-community/documentation/overview.md @@ -17,7 +17,7 @@ RM is split into two main parts - a repository integration and a Share integrati ### Artifacts and Guidance * [Community Source Code](https://github.com/Alfresco/records-management) -* [Enterprise Source Code](https://gitlab.alfresco.com/records-management/records-management) (for partners and customers) +* [Enterprise Source Code](https://github.com/Alfresco/governance-services) (for partners and customers) * [Community License](../LICENSE.txt) * [Enterprise License](../../rm-enterprise/LICENSE.txt) (this file will only be present in clones of the Enterprise repository) * [Issue Tracker Link](https://issues.alfresco.com/jira/projects/RM) From 97d0210496a02d79474cc0590d7f1cbf52d6dcaf Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 24 Mar 2020 12:34:57 +0200 Subject: [PATCH 20/42] RM-7131 Update old gitlab repo links with the new one from github (cherry picked from commit 50cced2cb6085f027ae3e3baa324ff705f7b821e) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8871ca43d5..08652ed02d 100644 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - scm:git:ssh://git@github.com/Alfresco/governance-services.git - V3.3.1 + scm:git:https://github.com/Alfresco/governance-services.git + scm:git:https://github.com/Alfresco/governance-services.git + https://github.com/Alfresco/governance-services + HEAD From e1f8042492f266930516392ff350da5557bb0dc7 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 21/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 79a440a101..eaa4854c2d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 9ac5b2b7e6c6239b26713582f3c8494f810928b8 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 22/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 473e03e16c..36e12dbcfa 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From eb90dfa59ba57855d42fd9d47ce3646eb6eac35b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 23/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 704f99759a..a659ec5c7e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 703aa755da4c4d8ec8741fc58681f547b895c93f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 24/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e720821e68..c809ed1b2d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 47887a4383901b129eff821d79b514434388d140 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 25/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3e1381b2d6..9d703e114e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From d99ed78ab8f35009a6a66c79c1ef18e3b94b7434 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 26/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 16580a61c7..d3727eac1b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From b8a08e0e52fc0b10102efbced6fb1427aaba1525 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 27/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 79a42a7d96..f94f72cdc1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 363e1a3ba873004c865668ded128034ef1bf437d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 28/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4e2103e1cf..61e7fb32ce 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 5087994d7033bb159bba4b36f2d0ad45299f1c1e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 29/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b17a557917..a7bb122483 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 467e9d1ca1513622572ea026da7b433c47fbeca0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 30/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b82c8eaff6..12987bbf2e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 4a55b6659a8289d8e239a152b7c707cf6a576007 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 31/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1438bba142..c81fceaf63 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 06b3fb165cefdc30a5f9b26b760b20b77f54fcef Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 32/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a8112af457..6af8ebe90c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 10944032cd91e6c74b5892b6e56631006c21fb67 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 33/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4258888f1c..bf2f01bbc1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From e57bb125d6f22c1dc9741c0849d09fa507791119 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 34/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 35e263fbfb..ee19f1a78f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 3cc75bfe61ca541c0d68a3a83b059ec15a3e2e0a Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 35/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f8e0d971c1..c468690b31 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 934eeb14e465306f165dfa691d5d0171371e6e34 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 36/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c3360da001..aca6d2b0ef 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From d6312dcd3d0f87d3d18ed8b1af9ee86d7ee87cc0 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 37/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ed90e70dca..66e9d23947 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 1aa7b7db26431d9d79df3a96b5bfe17ce1fc44a6 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 14 Apr 2020 16:53:41 +0300 Subject: [PATCH 38/42] Change SCM URLs in order to switch to SSH authentication with 2FA for Github (cherry picked from commit 7541e46ac44cdabc65db31428b157280350399fc) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 08652ed02d..c58a0e408e 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ - scm:git:https://github.com/Alfresco/governance-services.git - scm:git:https://github.com/Alfresco/governance-services.git - https://github.com/Alfresco/governance-services + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git + scm:git:ssh://git@github.com/Alfresco/governance-services.git HEAD From 06de12a10cdee972aef9f7ad4ea5cd5e10c752cc Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Tue, 9 Jun 2020 14:29:51 +0300 Subject: [PATCH 39/42] APPS-139 other code review comments --- .../action/dm/CreateRecordAction.java | 6 ++-- .../dm/DeclareAsVersionRecordAction.java | 8 +++--- .../action/dm/RecordActionUtils.java | 28 ++++++++----------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java index ef9245ed29..2a6ab6942f 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/CreateRecordAction.java @@ -27,6 +27,8 @@ package org.alfresco.module.org_alfresco_module_rm.action.dm; +import static org.alfresco.module.org_alfresco_module_rm.action.dm.RecordActionUtils.resolvePath; + import java.util.List; import org.alfresco.module.org_alfresco_module_rm.action.AuditableActionExecuterAbstractBase; @@ -128,13 +130,13 @@ public class CreateRecordAction extends AuditableActionExecuterAbstractBase Boolean hideRecordValue = ((Boolean) action.getParameterValue(PARAM_HIDE_RECORD)); if (hideRecordValue != null) { - hideRecord = hideRecordValue.booleanValue(); + hideRecord = hideRecordValue; } if (pathParameter != null && !pathParameter.isEmpty()) { RecordActionUtils.Services services = new Services(nodeService, filePlanService, authenticationUtil); - destinationRecordFolder = RecordActionUtils.resolvePath(services, filePlan, pathParameter, NAME); + destinationRecordFolder = resolvePath(services, filePlan, pathParameter, NAME); } synchronized (this) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java index a05b3eddd4..2a3fc4faf4 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java @@ -181,7 +181,7 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac logger.debug("Can not declare version as record, because " + actionedUponNodeRef.toString() + " is not a supported type."); } } - else if (!isActionEligible(actionedUponNodeRef)) + else if (isActionEligible(actionedUponNodeRef)) { NodeRef filePlan = (NodeRef)action.getParameterValue(PARAM_FILE_PLAN); if (filePlan == null) @@ -261,7 +261,7 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac { logger.debug("Can not declare version record, because " + actionedUponNodeRef.toString() + aspect.getValue()); } - return true; + return false; } } if (!nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_VERSIONABLE)) @@ -270,8 +270,8 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac { logger.debug("Can not declare version record, because " + actionedUponNodeRef.toString() + " does not have the versionable aspect applied."); } - return true; + return false; } - return false; + return true; } } diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java index 3a350b940d..de087d4edd 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/RecordActionUtils.java @@ -37,8 +37,8 @@ import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.namespace.QName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.util.StringUtils; /** @@ -50,7 +50,7 @@ public class RecordActionUtils /** * Logger */ - private static final Log LOGGER = LogFactory.getLog(RecordActionUtils.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RecordActionUtils.class); /** Private constructor to prevent instantiation. */ private RecordActionUtils() @@ -139,15 +139,12 @@ public class RecordActionUtils { throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path could not be found."); } - else + QName nodeType = nodeService.getType(nodeRef); + if (nodeType.equals(RecordsManagementModel.TYPE_HOLD_CONTAINER) || + nodeType.equals(RecordsManagementModel.TYPE_TRANSFER_CONTAINER) || + nodeType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER)) { - QName nodeType = nodeService.getType(nodeRef); - if (nodeType.equals(RecordsManagementModel.TYPE_HOLD_CONTAINER) || - nodeType.equals(RecordsManagementModel.TYPE_TRANSFER_CONTAINER) || - nodeType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER)) - { - throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path is invalid."); - } + throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the destination path is invalid."); } if (pathElements.size() > 1) { @@ -168,11 +165,10 @@ public class RecordActionUtils // if the file plan is still null, raise an exception if (filePlan == null) { - if (LOGGER.isDebugEnabled()) - { - LOGGER.debug("Unable to execute " + actionName + " action, because the fileplan path could not be determined. Make sure at least one file plan has been created."); - } - throw new AlfrescoRuntimeException("Unable to execute " + actionName + " action, because the fileplan path could not be determined."); + final String logMessage = + String.format("Unable to execute %s action, because the fileplan path could not be determined. Make sure at least one file plan has been created.", actionName); + LOGGER.debug(logMessage); + throw new AlfrescoRuntimeException(logMessage); } return filePlan; } From 11b2a84e7e6ade8a7fa9f75cd937ef3ba637fc85 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Tue, 9 Jun 2020 21:26:07 +0300 Subject: [PATCH 40/42] APPS-139 added new specific capability --- .../rm-capabilities-record-context.xml | 2 -- .../rm-capabilities-recordfolder-context.xml | 21 +++++++++++++++++++ .../messages/capability-service.properties | 1 + .../model/recordsPermissionModel.xml | 8 ++++++- .../security/rm-default-roles-bootstrap.json | 13 +++++++----- .../dm/DeclareAsVersionRecordAction.java | 4 ++-- 6 files changed, 39 insertions(+), 10 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml index 6c70ad4bf8..0f1015f7fa 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml @@ -158,7 +158,6 @@ parent="declarativeCapability"> - @@ -276,7 +275,6 @@ RECORD - RECORD_FOLDER diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml index 2420858b34..97f9aee406 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml @@ -62,6 +62,27 @@ + + + + + + RECORD_FOLDER + + + + + + + + + + + + + + + @@ -114,7 +115,8 @@ - + + @@ -232,6 +234,10 @@ + + + + diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json index 5771b8d991..257f495b84 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/security/rm-default-roles-bootstrap.json @@ -49,7 +49,8 @@ "RequestRecordInformation", "FileUnfiledRecords", "RejectRecords", - "LinkToRecords" + "LinkToRecords", + "FileVersionRecords" ] }, { @@ -74,7 +75,8 @@ "FileUnfiledRecords", "RejectRecords", "LinkToRecords", - "ManageAccessControls" + "ManageAccessControls", + "FileVersionRecords" ] }, { @@ -145,8 +147,8 @@ "DeleteHold", "EndRetention", "EditHold", - "ManageAccessControls" - + "ManageAccessControls", + "FileVersionRecords" ] }, { @@ -219,7 +221,8 @@ "FileHoldReport", "DeleteHold", "EditHold", - "EndRetention" + "EndRetention", + "FileVersionRecords" ] } ] \ No newline at end of file diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java index 2a3fc4faf4..0b8dc76dd8 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java @@ -74,7 +74,7 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac public static final String PARAM_FILE_PLAN = "file-plan"; public static final String PARAM_PATH = "path"; - private static final String EDIT_RECORD_METADATA_CAPABILITY = "EditRecordMetadata"; + private static final String FILE_VERSION_RECORDS_CAPABILITY = "FileVersionRecords"; /** Sync Model URI */ private static final String SYNC_MODEL_1_0_URI = "http://www.alfresco.org/model/sync/1.0"; @@ -213,7 +213,7 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac // create record from latest version if (destinationRecordFolder != null) { - boolean hasCapability = capabilityService.hasCapability(destinationRecordFolder, EDIT_RECORD_METADATA_CAPABILITY); + boolean hasCapability = capabilityService.hasCapability(destinationRecordFolder, FILE_VERSION_RECORDS_CAPABILITY); // validate destination record folder if (hasCapability) { From 23d48bcf2ed22462acfa10e4aea460fe824a2396 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Wed, 10 Jun 2020 08:53:58 +0300 Subject: [PATCH 41/42] APPS-139 fix unit test --- .../action/dm/DeclareAsVersionRecordActionUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java index edfef6560e..86a9f49bf0 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordActionUnitTest.java @@ -313,7 +313,7 @@ public class DeclareAsVersionRecordActionUnitTest extends BaseActionUnitTest doReturn(TYPE_RECORD_FOLDER).when(mockedNodeService).getType(destinationRecordFolderNodeRef); // capability check - doReturn(true).when(mockedCapabilityService).hasCapability(destinationRecordFolderNodeRef, "EditRecordMetadata"); + doReturn(true).when(mockedCapabilityService).hasCapability(destinationRecordFolderNodeRef, "FileVersionRecords"); // file plan service doReturn(filePlan).when(mockedFilePlanService).getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID); From 18c9059a855a6b1cb099fa9a1192128e304d22b5 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Wed, 10 Jun 2020 09:56:56 +0300 Subject: [PATCH 42/42] APPS-139 code review changes --- .../capability/rm-capabilities-record-context.xml | 1 + .../action/dm/DeclareAsVersionRecordAction.java | 13 +++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml index 0f1015f7fa..40a454449b 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml @@ -158,6 +158,7 @@ parent="declarativeCapability"> + diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java index 0b8dc76dd8..3ad3c4cf00 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/dm/DeclareAsVersionRecordAction.java @@ -188,17 +188,14 @@ public class DeclareAsVersionRecordAction extends AuditableActionExecuterAbstrac { filePlan = RecordActionUtils.getDefaultFilePlan(authenticationUtil, filePlanService, NAME); } - else + // verify that the provided file plan is actually a file plan + else if (!filePlanService.isFilePlan(filePlan)) { - // verify that the provided file plan is actually a file plan - if (!filePlanService.isFilePlan(filePlan)) + if (logger.isDebugEnabled()) { - if (logger.isDebugEnabled()) - { - logger.debug("Can not declare version record, because the provided file plan node reference is not a file plan."); - } - throw new AlfrescoRuntimeException("Can not declare version record, because the provided file plan node reference is not a file plan."); + logger.debug("Can not declare version record, because the provided file plan node reference is not a file plan."); } + throw new AlfrescoRuntimeException("Can not declare version record, because the provided file plan node reference is not a file plan."); } // resolve destination record folder if path supplied