From 68da4b9a93666862855556a81007168118e345b3 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Sun, 19 Mar 2017 00:16:37 +0000 Subject: [PATCH 1/3] RM-4808 (Update Record Folder: Reopen a close folder via PUT request throw Permission denied exception) --- .../fileplancomponents/RecordFolderTests.java | 48 +++++++++++++++++++ .../rm-capabilities-group-context.xml | 1 - .../rm-capabilities-recordfolder-context.xml | 1 - 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java index 86bf3b2e1a..acb3f9425a 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java @@ -441,6 +441,54 @@ public class RecordFolderTests extends BaseRMRestTest assertTrue(folder2.getPath().getName().contains(NEW_RELATIVE_PATH)); } + /** + * Given that a record folder exists + * When the record folder is closed + * Then a request can be made to reopen it + */ + @Test + ( + description = "A closed record folder can be reopened" + ) + @Bug(id="RM-4808") + public void openClosedRecordFolder() throws Exception + { + // Create a record folder + FilePlanComponent recordFolder = createCategoryFolderInFilePlan(); + + // Assert that the record folder is not closed + assertFalse(recordFolder.getProperties().getIsClosed()); + + // Get the file plan component API + FilePlanComponentAPI filePlanComponentsAPI = getRestAPIFactory().getFilePlanComponentsAPI(); + + // Create a record folder model to closed it + FilePlanComponent recordFolderModel = FilePlanComponent.builder() + .properties(FilePlanComponentProperties.builder() + .isClosed(true) + .build()) + .build(); + + // Make a request to close the record folder + FilePlanComponent updatedRecordFolder = filePlanComponentsAPI.updateFilePlanComponent(recordFolderModel, recordFolder.getId()); + + // Verify that the record folder is closed now + assertTrue(updatedRecordFolder.getProperties().getIsClosed()); + + // Create a record folder model to reopen it + recordFolderModel = FilePlanComponent.builder() + .properties(FilePlanComponentProperties.builder() + .isClosed(false) + .build()) + .build(); + + // Make a request to reopen the record folder + updatedRecordFolder = filePlanComponentsAPI.updateFilePlanComponent(recordFolderModel, recordFolder.getId()); + + // Verify that the record folder is open now + assertFalse(updatedRecordFolder.getProperties().getIsClosed()); + } + @AfterClass (alwaysRun = true) public void tearDown() throws Exception { diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml index f68edd726c..7560098bbc 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml @@ -61,7 +61,6 @@ - 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 cd98e93eb4..12ae4d7788 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 @@ -94,7 +94,6 @@ - From 0d7d8e2fbfe6f1ab64b45349da12b1bb18fabe4f Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 20 Mar 2017 10:19:25 +0000 Subject: [PATCH 2/3] Fixed typo --- .../rest/rm/community/fileplancomponents/RecordFolderTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java index acb3f9425a..3f0737b925 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java @@ -462,7 +462,7 @@ public class RecordFolderTests extends BaseRMRestTest // Get the file plan component API FilePlanComponentAPI filePlanComponentsAPI = getRestAPIFactory().getFilePlanComponentsAPI(); - // Create a record folder model to closed it + // Create a record folder model to close it FilePlanComponent recordFolderModel = FilePlanComponent.builder() .properties(FilePlanComponentProperties.builder() .isClosed(true) From 4f2467ea5ddf30c753ee380bbe79e72d92d8485d Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 20 Mar 2017 18:42:01 +0000 Subject: [PATCH 3/3] RM-4760 (Update source control management info in the parent pom) --- pom.xml | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b94a8565ef..c17028843d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,6 @@ 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 @@ -42,8 +41,8 @@ - alfresco-internal - https://artifacts.alfresco.com/nexus/content/groups/private + alfresco-public + https://artifacts.alfresco.com/nexus/content/groups/public @@ -79,12 +78,36 @@ rm-community - rm-enterprise - rm-automation + + + enterprise + + + !community + + + + rm-enterprise + rm-automation + + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/groups/private + + + + + alfresco-private + https://artifacts.alfresco.com/nexus/content/groups/private + + + + + - ${project.version} false 1.7 1.8 @@ -141,7 +164,7 @@ rm.module.version - ${alfresco.rm.version} + ${project.version} ([0-9\.]*[0-9]).* $1 false