From ccc117ed50e0e52317a8cc538399dfef79d5e1b2 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 2 May 2017 08:13:41 +0100 Subject: [PATCH 01/11] [maven-release-plugin] prepare release V2.5.2-EA1 --- pom.xml | 5 +++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index eca2b926d2..52cd003d7b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-SNAPSHOT + 2.5.2-EA1 Alfresco Records Management @@ -24,7 +24,8 @@ 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-EA1 + JIRA diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1e82d8ca5a..c493077ea1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-SNAPSHOT + 2.5.2-EA1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 43bb9e188a..edb7e0e1c4 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-SNAPSHOT + 2.5.2-EA1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3d1fa7be44..dd8be1eac4 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.2-SNAPSHOT + 2.5.2-EA1 From 6ac173c85e862992bd77932261036f4c22a17cb8 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 2 May 2017 08:13:44 +0100 Subject: [PATCH 02/11] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 52cd003d7b..57e6bdd1d7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-EA1 + 2.5.2-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ 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-EA1 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index c493077ea1..1e82d8ca5a 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-EA1 + 2.5.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index edb7e0e1c4..43bb9e188a 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-EA1 + 2.5.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index dd8be1eac4..3d1fa7be44 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.2-EA1 + 2.5.2-SNAPSHOT From 0dea341e0bf7ccbd5339385a9eb32692e8a81b7e Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Tue, 2 May 2017 10:53:54 +0300 Subject: [PATCH 03/11] Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 6ac173c85e862992bd77932261036f4c22a17cb8. --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 57e6bdd1d7..52cd003d7b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-SNAPSHOT + 2.5.2-EA1 Alfresco Records Management @@ -24,7 +24,7 @@ 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 + V2.5.2-EA1 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1e82d8ca5a..c493077ea1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-SNAPSHOT + 2.5.2-EA1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 43bb9e188a..edb7e0e1c4 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-SNAPSHOT + 2.5.2-EA1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3d1fa7be44..dd8be1eac4 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.2-SNAPSHOT + 2.5.2-EA1 From b493bb666254fe73de37912bcf1daa8776df9124 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Tue, 2 May 2017 10:54:12 +0300 Subject: [PATCH 04/11] Revert "[maven-release-plugin] prepare release V2.5.2-EA1" This reverts commit ccc117ed50e0e52317a8cc538399dfef79d5e1b2. --- pom.xml | 5 ++--- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 52cd003d7b..eca2b926d2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-EA1 + 2.5.2-SNAPSHOT Alfresco Records Management @@ -24,8 +24,7 @@ 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-EA1 - + JIRA diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index c493077ea1..1e82d8ca5a 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-EA1 + 2.5.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index edb7e0e1c4..43bb9e188a 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-EA1 + 2.5.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index dd8be1eac4..3d1fa7be44 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.2-EA1 + 2.5.2-SNAPSHOT From 19c5b095356d5f62bc852d192aebd01394dd0f2c Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 2 May 2017 09:15:28 +0100 Subject: [PATCH 05/11] [maven-release-plugin] prepare release V2.5.2-EA1 --- pom.xml | 5 +++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index eca2b926d2..52cd003d7b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-SNAPSHOT + 2.5.2-EA1 Alfresco Records Management @@ -24,7 +24,8 @@ 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-EA1 + JIRA diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1e82d8ca5a..c493077ea1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-SNAPSHOT + 2.5.2-EA1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 43bb9e188a..edb7e0e1c4 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-SNAPSHOT + 2.5.2-EA1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3d1fa7be44..dd8be1eac4 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.2-SNAPSHOT + 2.5.2-EA1 From 6b1a0e46157e7284b0b29d0a616aa8402ec94b06 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 2 May 2017 09:15:31 +0100 Subject: [PATCH 06/11] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 52cd003d7b..57e6bdd1d7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5.2-EA1 + 2.5.2-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ 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-EA1 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index c493077ea1..1e82d8ca5a 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-EA1 + 2.5.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index edb7e0e1c4..43bb9e188a 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5.2-EA1 + 2.5.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index dd8be1eac4..3d1fa7be44 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.5.2-EA1 + 2.5.2-SNAPSHOT From 05b43fb770da6fc75fd7fdcd828d470bfa265f9e Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Wed, 3 May 2017 16:46:42 +0300 Subject: [PATCH 07/11] - minor corrections and fix for deleteInvalidNodesUnfiled() --- .../rm/community/requests/gscore/api/RecordFolderAPI.java | 2 +- .../rest/rm/community/recordfolders/RecordFolderTests.java | 4 ++-- .../unfiledrecordfolders/UnfiledRecordsFolderTests.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordFolderAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordFolderAPI.java index d88d2b3a3f..f993bd8998 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordFolderAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordFolderAPI.java @@ -223,7 +223,7 @@ public class RecordFolderAPI extends RMModelRequest /** * Create a record from file resource * - * @param electronicRecordModel {@link Record} for electronic record to be created + * @param recordModel {@link Record} for electronic record to be created * @param recordContent {@link File} pointing to the content of the electronic record to be created * @param recordFolderId The identifier of a record folder * @return newly created {@link Record} diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java index 2843995a80..6381fe88f9 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordfolders/RecordFolderTests.java @@ -131,7 +131,7 @@ public class RecordFolderTests extends BaseRMRestTest /** * 
      * Given that RM site is created
-     * When I use the API to create a children inside a record folder with wron  types
+     * When I use the API to create a children of wrong type inside a record folder 
      * Then the operation fails
      *
*/ @@ -141,7 +141,7 @@ public class RecordFolderTests extends BaseRMRestTest dataProvider = "childrenNotAllowedForFolder" ) - public void createRecordFolderIntoSpecialContainers(String nodeType) throws Exception + public void createInvalidChildrenForFolder(String nodeType) throws Exception { //create a record folder RecordCategoryChild folder = createCategoryFolderInFilePlan(); diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledrecordfolders/UnfiledRecordsFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledrecordfolders/UnfiledRecordsFolderTests.java index cfca221474..7e6c18b500 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledrecordfolders/UnfiledRecordsFolderTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/unfiledrecordfolders/UnfiledRecordsFolderTests.java @@ -106,7 +106,7 @@ public class UnfiledRecordsFolderTests extends BaseRMRestTest { getRestAPIFactory().getUnfiledContainersAPI().getUnfiledContainer(UNFILED_RECORDS_CONTAINER_ALIAS).getId() }, { getRestAPIFactory().getTransferContainerAPI().getTransferContainer(TRANSFERS_ALIAS).getId() }, // an arbitrary record category - { createRootCategory(RECORD_CATEGORY_NAME).getId() }, + { createRootCategory(RECORD_CATEGORY_NAME + getRandomAlphanumeric()).getId() }, // an arbitrary unfiled records folder {createCategoryFolderInFilePlan().getId()}, {createUnfiledContainerChild(UNFILED_RECORDS_CONTAINER_ALIAS, "Unfiled Record " + getRandomAlphanumeric(), CONTENT_TYPE).getId() } From 83bd31894889beb0f2dc998b382b22fb5f4c4a80 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Thu, 4 May 2017 16:36:58 +0300 Subject: [PATCH 08/11] fixed onContentUpdated node not found failure --- .../module/org_alfresco_module_rm/record/RecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java index b69af29123..80efdda107 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java @@ -1798,7 +1798,7 @@ public class RecordServiceImpl extends BaseBehaviourBean ) public void onContentUpdate(NodeRef nodeRef, boolean newContent) { - if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE)) + if (nodeService.exists(nodeRef) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE)) { appendIdentifierToName(nodeService, nodeRef); } From 066add969cec30136a23a3f31ebb00e9fbcbfaa2 Mon Sep 17 00:00:00 2001 From: Rodica Sutu Date: Fri, 5 May 2017 15:15:06 +0300 Subject: [PATCH 09/11] fix the createRecordFolderWithRelativePath() test, avoid duplicate record category name --- .../rm/community/recordcategories/RecordCategoryTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java index 9d1dfa9a90..92d1073588 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/RecordCategoryTests.java @@ -488,7 +488,7 @@ public class RecordCategoryTests extends BaseRMRestTest { // The record category to be created RecordCategory recordCategoryModel = RecordCategory.builder() - .name(RECORD_CATEGORY_NAME) + .name(RECORD_CATEGORY_NAME + getRandomAlphanumeric()) .nodeType(RECORD_CATEGORY_TYPE) .build(); FilePlanAPI filePlansAPI = getRestAPIFactory().getFilePlansAPI(); @@ -593,7 +593,7 @@ public class RecordCategoryTests extends BaseRMRestTest { // The record category to be created RecordCategory recordCategoryModel = RecordCategory.builder() - .name(RECORD_CATEGORY_NAME+getRandomAlphanumeric()) + .name(RECORD_CATEGORY_NAME + getRandomAlphanumeric()) .nodeType(RECORD_CATEGORY_TYPE) .build(); FilePlanAPI filePlansAPI = getRestAPIFactory().getFilePlansAPI(); From 6c46a04a5a9a23bcf933498504a3f72e05eb29af Mon Sep 17 00:00:00 2001 From: Ramona Popa Date: Tue, 9 May 2017 18:18:45 +0300 Subject: [PATCH 10/11] RM-4921 - fixed failing test --- .../model/fileplancomponents/FilePlanComponentFields.java | 1 + .../model/recordcategory/RecordCategoryChildProperties.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java index ac79160c48..7aee19b09d 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java @@ -51,6 +51,7 @@ public class FilePlanComponentFields /** Common properties for record folders and records */ public static final String PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE = "rma:recordSearchHasDispositionSchedule"; + public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION = "rma:recordSearchDispositionPeriodExpression"; /** File plan properties */ public static final String PROPERTIES_COMPONENT_ID = "st:componentId"; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java index 100fcb36b4..c1fe448268 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java @@ -34,6 +34,7 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_LOCATION; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_OWNER; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_REVIEW_PERIOD; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; @@ -105,6 +106,9 @@ public class RecordCategoryChildProperties extends TestModel @JsonProperty (PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE) private Boolean recordSearchHasDispositionSchedule; + + @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION) + private Boolean recordSearchDispositionPeriodExpression; @JsonProperty (PROPERTIES_OWNER) private Owner owner; From 31952b57aa5aeee35d22da5eea45dd98dfc8899b Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Wed, 10 May 2017 16:54:42 +0300 Subject: [PATCH 11/11] RM-4921 - added missing fields in record category child properties --- .../FilePlanComponentFields.java | 7 +++++ .../RecordCategoryChildProperties.java | 28 ++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java index 7aee19b09d..d30bbb92ac 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentFields.java @@ -52,6 +52,13 @@ public class FilePlanComponentFields /** Common properties for record folders and records */ public static final String PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE = "rma:recordSearchHasDispositionSchedule"; public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION = "rma:recordSearchDispositionPeriodExpression"; + public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY = "rma:recordSearchDispositionAuthority"; + public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF = "rma:recordSearchDispositionActionAsOf"; + public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD = "rma:recordSearchDispositionPeriod"; + public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME = "rma:recordSearchDispositionActionName"; + public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE = "rma:recordSearchDispositionEventsEligible"; + public static final String PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS = "rma:recordSearchDispositionInstructions"; + /** File plan properties */ public static final String PROPERTIES_COMPONENT_ID = "st:componentId"; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java index c1fe448268..67e87511b4 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/recordcategory/RecordCategoryChildProperties.java @@ -35,11 +35,19 @@ import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanCo import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_OWNER; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_HAS_DISPOSITION_SCHEDULE; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_REVIEW_PERIOD; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_ROOT_NODE_REF; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_TITLE; import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentFields.PROPERTIES_VITAL_RECORD_INDICATOR; +import java.util.Date; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -108,7 +116,25 @@ public class RecordCategoryChildProperties extends TestModel private Boolean recordSearchHasDispositionSchedule; @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD_EXPRESSION) - private Boolean recordSearchDispositionPeriodExpression; + private String recordSearchDispositionPeriodExpression; + + @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_AUTHORITY) + private String recordSearchDispositionAuthority; + + @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_AS_OF) + private Date recordSearchDispositionActionAsOf; + + @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_PERIOD) + private String recordSearchDispositionPeriod; + + @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_ACTION_NAME) + private String recordSearchDispositionActionName; + + @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_EVENTS_ELIGIBLE) + private Boolean recordSearchDispositionEventsEligible; + + @JsonProperty (PROPERTIES_RECORD_SEARCH_DISPOSITION_INSTRUCTIONS) + private String recordSearchDispositionInstructions; @JsonProperty (PROPERTIES_OWNER) private Owner owner;