From 9920ef15004ad7891c01f1473521ec01897f8581 Mon Sep 17 00:00:00 2001 From: Bogdan Ioan Gabor Date: Fri, 4 Dec 2020 13:45:04 +0200 Subject: [PATCH 1/7] APPS-580: Fixed the issue by using System user instead of the admin user. --- .../alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml | 2 +- .../alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml b/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml index d5cb481437..b7258ad350 100644 --- a/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml +++ b/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml @@ -3,7 +3,7 @@ RM Saved Searches /slingshot/rmsavedsearches/site/{site}/{name} argument - user + user required internal \ No newline at end of file diff --git a/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml b/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml index f48520e4cd..799793fed6 100644 --- a/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml +++ b/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml @@ -3,7 +3,7 @@ RM Saved Searches /slingshot/rmsavedsearches/site/{site} argument - user + user required internal \ No newline at end of file From 66f85d9d6b7b2f3f77ac25669dd3a9a97560a7c5 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 8 Dec 2020 12:06:01 +0200 Subject: [PATCH 2/7] Revert "Merge pull request #1291 from Alfresco/hotfix-3.2.0.11/MNT-22062_diplay_cat_retention_poor_performance" This reverts commit 95f47d0afaab5425f55bf826fa0ebbb81b7ff5a3, reversing changes made to bb8e7d9c93f674db4d0f0bb5d1a6592d6b3548cf. --- .../disposition/DispositionServiceImpl.java | 47 +------------------ 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java index 0abdf64dd6..5502aed5ba 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java @@ -503,52 +503,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl @Override public boolean hasDisposableItems(DispositionSchedule dispositionSchdule) { - ParameterCheck.mandatory("dispositionSchedule", dispositionSchdule); - - // Get the associated container - NodeRef rmContainer = getAssociatedRecordsManagementContainer(dispositionSchdule); - - return hasDisposableItemsImpl(dispositionSchdule.isRecordLevelDisposition(), rmContainer); - } - - /** - * Method that provides a boolean if given Records Management Container has disposable items. - * This method is similar to getDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer) but with improved performance: - * For RecordLevelDisposition it will limit Record retrieval to 1. - * Early returns once the first occurrence is found. - * @param isRecordLevelDisposition - * @param rmContainer - * @return - */ - private boolean hasDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer) - { - List items = filePlanService.getAllContained(rmContainer); - for (NodeRef item : items) - { - if (recordFolderService.isRecordFolder(item)) - { - if (isRecordLevelDisposition) - { - List assocs = nodeService.getChildAssocs(item, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL, 1, true); - if (!assocs.isEmpty()) - { - return true; - } - } - else - { - return true; - } - } - else if (filePlanService.isRecordCategory(item) && getAssociatedDispositionScheduleImpl(item) == null) - { - if (hasDisposableItemsImpl(isRecordLevelDisposition, item)); - { - return true; - } - } - } - return false; + return !getDisposableItems(dispositionSchdule).isEmpty(); } /** From 94fca6d26784edb5d40f5c34615d56bbf8156e95 Mon Sep 17 00:00:00 2001 From: ehardon Date: Tue, 8 Dec 2020 12:44:02 +0200 Subject: [PATCH 3/7] [enterprise release 3.4.1 3.4.2-SNAPSHOT][publish] [skip tests] From f2c607d488d9e969fb0bfe1abdeb6f326a618ea4 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 8 Dec 2020 11:41:06 +0000 Subject: [PATCH 4/7] [maven-release-plugin][skip ci] prepare release V3.4.1 --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index da542adffa..896753f9ef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.4.1-SNAPSHOT + 3.4.1 Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - V3.4.0 + V3.4.1 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 07aa4d97e9..ec64458d8c 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index 5c8fb293e6..cdf648c615 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index cc0be9ba64..bbdff91000 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index fd227719b3..c02e78a83f 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.4.1-SNAPSHOT + 3.4.1 diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 8e8b8ef613..0acb2ae00f 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.4.1-SNAPSHOT + 3.4.1 From e23bcd810cd3f6eb2bffc0c4c2ad0a7449c12da8 Mon Sep 17 00:00:00 2001 From: Travis CI User Date: Tue, 8 Dec 2020 11:41:14 +0000 Subject: [PATCH 5/7] [maven-release-plugin][skip ci] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 896753f9ef..6c4ed2936a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.4.1 + 3.4.2-SNAPSHOT Alfresco Governance Services http://www.alfresco.org/ @@ -18,7 +18,7 @@ scm:git:https://github.com/Alfresco/governance-services.git scm:git:https://github.com/Alfresco/governance-services.git https://github.com/Alfresco/governance-services - V3.4.1 + V3.4.0 diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index ec64458d8c..f3852883e5 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.4.1 + 3.4.2-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index cdf648c615..15a86e87e5 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.4.1 + 3.4.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index bbdff91000..7c6e53e54a 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.4.1 + 3.4.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index c02e78a83f..b5bab17de8 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.4.1 + 3.4.2-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 0acb2ae00f..c0264cda29 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.4.1 + 3.4.2-SNAPSHOT From 0967709b44e2fb90b26bdc2ad2182c041f848070 Mon Sep 17 00:00:00 2001 From: Bogdan Ioan Gabor Date: Tue, 8 Dec 2020 14:19:12 +0200 Subject: [PATCH 6/7] =?UTF-8?q?Revert=20"APPS-580:=20Fixed=20the=20issue?= =?UTF-8?q?=20by=20using=20System=20user=20instead=20of=20the=20admin=20u?= =?UTF-8?q?=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml | 2 +- .../alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml b/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml index b7258ad350..d5cb481437 100644 --- a/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml +++ b/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.delete.desc.xml @@ -3,7 +3,7 @@ RM Saved Searches /slingshot/rmsavedsearches/site/{site}/{name} argument - user + user required internal \ No newline at end of file diff --git a/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml b/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml index 799793fed6..f48520e4cd 100644 --- a/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml +++ b/rm-community/rm-community-repo/config/alfresco/templates/webscripts/org/alfresco/slingshot/rmsearch/rmsavedsearches.post.desc.xml @@ -3,7 +3,7 @@ RM Saved Searches /slingshot/rmsavedsearches/site/{site} argument - user + user required internal \ No newline at end of file From b74add92944cb5fa1b40c8435c767268e35a4392 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 8 Dec 2020 14:30:40 +0200 Subject: [PATCH 7/7] Update version to 3.4.1.1-SNAPSHOT --- pom.xml | 2 +- rm-automation/pom.xml | 2 +- rm-automation/rm-automation-community-rest-api/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- rm-community/rm-community-rest-api-explorer/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 896753f9ef..c739f8d691 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-governance-services pom - 3.4.1 + 3.4.1.1-SNAPSHOT Alfresco Governance Services http://www.alfresco.org/ diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index ec64458d8c..fe7c5cfcba 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.4.1 + 3.4.1.1-SNAPSHOT diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml index cdf648c615..aeac406a67 100644 --- a/rm-automation/rm-automation-community-rest-api/pom.xml +++ b/rm-automation/rm-automation-community-rest-api/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services-automation - 3.4.1 + 3.4.1.1-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index bbdff91000..8767fddc5d 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-governance-services - 3.4.1 + 3.4.1.1-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index c02e78a83f..8d9360703d 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-governance-services-community - 3.4.1 + 3.4.1.1-SNAPSHOT diff --git a/rm-community/rm-community-rest-api-explorer/pom.xml b/rm-community/rm-community-rest-api-explorer/pom.xml index 0acb2ae00f..6f902058fa 100644 --- a/rm-community/rm-community-rest-api-explorer/pom.xml +++ b/rm-community/rm-community-rest-api-explorer/pom.xml @@ -7,7 +7,7 @@ org.alfresco alfresco-governance-services-community - 3.4.1 + 3.4.1.1-SNAPSHOT