From 271eac044e294fac9eb10b3f0c0c2a31eed100e0 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 19 May 2014 08:48:27 +0000 Subject: [PATCH 1/9] Added JIRA-Ticket Info git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@70625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org_alfresco_module_rm/script/slingshot/RMSearchGet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java index eb46eb54fb..58272a84e0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java @@ -208,7 +208,7 @@ public class RMSearchGet extends DeclarativeWebScript List items = new ArrayList(results.size()); for (NodeRef nodeRef : results) { - // FIXME: This is a workaround for DOD Recert + // FIXME: See RM-478 // TC 3-3 Create User Groups try { From 61f9103752b3eb4dfd3c0ff9622cfadc4adf73e9 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Tue, 20 May 2014 13:08:44 +0000 Subject: [PATCH 2/9] Fixed RM 2.1 to get it working with Alfresco 4.2.2 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@71381 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- gradle.properties | 2 +- .../alfresco/module/org_alfresco_module_rm/rm-model-context.xml | 2 +- .../module/org_alfresco_module_rm/rm-ui-evaluators-context.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 429e591382..2ce9c67304 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ alfrescoEnterpriseMavenPwd= # set to org.alfresco.enterprise when enterprise version required alfrescoGroupId=org.alfresco -alfrescoBaseVersion=4.2.0 +alfrescoBaseVersion=4.2.2-SNAPSHOT # indicates whether this is a local build or not localBuild=true diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml index db13fd4aec..c2f7b6c779 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml @@ -4,7 +4,7 @@ - + alfresco/module/org_alfresco_module_rm/model/recordsModel.xml diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml index e7cf19c2dd..a62f5a1b93 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml @@ -10,6 +10,7 @@ + Date: Fri, 28 Aug 2015 06:09:45 +0000 Subject: [PATCH 3/9] RM-2391 - also check for the access audit capability on each node from the report git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rm-service-context.xml | 1 + .../RecordsManagementAuditServiceImpl.java | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 6de002f343..016ae2361a 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -917,6 +917,7 @@ + cm:lastThumbnailModification diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java index b0b406217c..6c2e81679f 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditServiceImpl.java @@ -40,6 +40,7 @@ import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction; import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService; import org.alfresco.module.org_alfresco_module_rm.audit.event.AuditEvent; +import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService; import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService; import org.alfresco.repo.audit.AuditComponent; import org.alfresco.repo.audit.model.AuditApplication; @@ -62,6 +63,7 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.MLText; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; @@ -98,6 +100,8 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean /** Logger */ private static Log logger = LogFactory.getLog(RecordsManagementAuditServiceImpl.class); + private static final String ACCESS_AUDIT_CAPABILITY = "AccessAudit"; + private static final String KEY_RM_AUDIT_NODE_RECORDS = "RMAUditNodeRecords"; protected static final String RM_AUDIT_EVENT_LOGIN_SUCCESS = "Login.Success"; @@ -179,6 +183,7 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean private RecordsManagementActionService rmActionService; private FilePlanService filePlanService; private NamespaceService namespaceService; + protected CapabilityService capabilityService; private boolean shutdown = false; @@ -270,6 +275,17 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean { this.namespaceService = namespaceService; } + + /** + * @param capabilityService capability service + */ + public void setCapabilityService(CapabilityService capabilityService) + { + this.capabilityService = capabilityService; + } + + + /** * @param ignoredAuditProperties @@ -904,6 +920,13 @@ public class RecordsManagementAuditServiceImpl extends AbstractLifecycleBean // Skip it return true; } + + if( nodeRef != null && + !AccessStatus.ALLOWED.equals( + capabilityService.getCapabilityAccessState(nodeRef, ACCESS_AUDIT_CAPABILITY))) + { + return true; + } // TODO: Refactor this to use the builder pattern RecordsManagementAuditEntry entry = new RecordsManagementAuditEntry( From 3546680dcfb61ee40ec490fc9b65e74e025ea799 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 8 Sep 2015 15:14:05 +0000 Subject: [PATCH 4/9] Update Alfresco to 4.2.2.24. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@111641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2ce9c67304..217d5d6f31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ alfrescoEnterpriseMavenPwd= # set to org.alfresco.enterprise when enterprise version required alfrescoGroupId=org.alfresco -alfrescoBaseVersion=4.2.2-SNAPSHOT +alfrescoBaseVersion=4.2.2.24 # indicates whether this is a local build or not localBuild=true From dd8d6672053b81350e9c270ea3a92891fcc58c06 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 9 Sep 2015 10:30:08 +0000 Subject: [PATCH 5/9] Merged BRANCHES/V2.1 to BRANCHES/V2.2: 111636: Merged BRANCHES/V2.1.0.x to BRANCHES/V2.1: 68559: Change base Alfresco version from 4.2.0-RC4 to 4.2.0 68568: Merge from HEAD to BRANCHES/V2.1.0.x 68569: Update module version to 2.1.0.1 76475: Merge HEAD to BRANCHES/V2.1.0.x: 76597: Merge HEAD to BRANCHES/V2.1.0.x: 74932: RM-1461: CLONE - RM slower then standard repo/sites when rendering document details when folder contains 15k documents 76598: Merged HEAD to BRANCHES/V2.1.0.x: 75102: RM Performance testing 76599: Update module version to 2.1.0.2 76601: Merged HEAD to BRANCHES/V2.1.0.x: 75186: RM Performance Improvements 76673: Root container cache to improve unfiled record browse performance * relates to RM-1594 and RM-1595 76850: RM performance enhancements * serach improvements * in-place record browse improvements * saved search via file plan browse improvements 76851: Additional unit test to check extended security with cache is working as expected. 76852: Rollback checked in config 77709: RM-1630: Error on manage references page * regression caused by performance improvements 84337: Update version to 2.1.0.3 84421: Transaction level cahcing of declarative capability evaluation 84676: Fix build 84677: Prevent unnessary repeated creation of QName 84678: Improvements to extended dynamic authorities * requiredFor set * direct access to extended permission information, not via service 84679: Correct requiredFor value 88087: RM-1661 (Performance on setting permissions at a high category level) 88092: RM-1661 (Performance on setting permissions at a high category level) * Fixed failing unit tests 88144: RM-1661 (Performance on setting permissions at a high category level) 88182: RM-1724 (Inheritance is not off for root categories, unfiled records, holds and transfers) 88192: RM-1661 (Performance on setting permissions at a high category level) * Added unit tests 88193: RM-1661 (Performance on setting permissions at a high category level) * Fixed failing unit tests 88358: RM-1661 (Performance on setting permissions at a high category level) * Added unit tests 88685: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions) 88686: RM-1741 (Moved root category doesn't inherit permissions) 88687: RM-1741 (Moved root category doesn't inherit permissions) * Unit test added 88688: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions) * Unit test added 88691: RM-1745 (RM Admin role can only be added with read permission on the manage permission page) 88772: RM-1741 (Moved root category doesn't inherit permissions) 88860: RM-1661 (Performance on setting permissions at a high category level) 88864: RM-1661 (Performance on setting permissions at a high category level) * Fixed failing unit tests 88959: RM-1746 (Moved record/category always have the inheritance on) 88960: RM-1661 (Performance on setting permissions at a high category level) * Fixed failing unit tests 88961: RM-1661 (Performance on setting permissions at a high category level) * Fixed failing unit tests 88962: RM-1661 (Performance on setting permissions at a high category level) * Fixed failing unit tests 91745: RM-1785 (RM: HF 2.1.0.3-33 causes permissions to not be displayed in Share everywhere else in the repo) 91838: Update version to 2.1.0.4 111641: Update Alfresco to 4.2.2.24. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../extended-repository-context.xml | 57 +++++++++++++++++++ .../org_alfresco_module_rm/rm-job-context.xml | 2 + .../rm-service-context.xml | 1 + 3 files changed, 60 insertions(+) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml index 2b10615154..989dfc2be0 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml @@ -3,12 +3,38 @@ +<<<<<<< .working +======= + + +>>>>>>> .merge-right.r111658 @@ -42,7 +68,12 @@ +<<<<<<< .working +======= + + +>>>>>>> .merge-right.r111658 @@ -67,11 +98,19 @@ +<<<<<<< .working +======= + + + + + +>>>>>>> .merge-right.r111658 @@ -198,6 +237,7 @@ ${rm.autocompletesuggestion.maxsuggestions.node} +<<<<<<< .working @@ -208,6 +248,9 @@ +======= + +>>>>>>> .merge-right.r111658 @@ -235,6 +278,7 @@ false +<<<<<<< .working @@ -244,6 +288,19 @@ +======= + + + + + + ${rm.rule.runasrmadmin} + + + + + +>>>>>>> .merge-right.r111658 diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml index 1a28ac1156..c975a79827 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-job-context.xml @@ -94,6 +94,8 @@ + + ${rm.dispositionlifecycletrigger.cronexpression} diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 016ae2361a..72735a2f1c 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -387,6 +387,7 @@ + From 885dbe183b3a9954317cb360d74c8a6b6e71fc13 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 9 Sep 2015 13:19:06 +0000 Subject: [PATCH 6/9] Fixing unresolved merge conflicts. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../extended-repository-context.xml | 57 ------------------- .../rm-service-context.xml | 1 - .../rm-ui-evaluators-context.xml | 1 + 3 files changed, 1 insertion(+), 58 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml index 989dfc2be0..2b10615154 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml @@ -3,38 +3,12 @@ -<<<<<<< .working -======= - - ->>>>>>> .merge-right.r111658 @@ -68,12 +42,7 @@ -<<<<<<< .working -======= - - ->>>>>>> .merge-right.r111658 @@ -98,19 +67,11 @@ -<<<<<<< .working -======= - - - - - ->>>>>>> .merge-right.r111658 @@ -237,7 +198,6 @@ ${rm.autocompletesuggestion.maxsuggestions.node} -<<<<<<< .working @@ -248,9 +208,6 @@ -======= - ->>>>>>> .merge-right.r111658 @@ -278,7 +235,6 @@ false -<<<<<<< .working @@ -288,19 +244,6 @@ -======= - - - - - - ${rm.rule.runasrmadmin} - - - - - ->>>>>>> .merge-right.r111658 diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml index 72735a2f1c..016ae2361a 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml @@ -387,7 +387,6 @@ - diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml index 5db8392b28..14b6209dc4 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml @@ -15,6 +15,7 @@ + From fcce656f061155880daddd9468f4c1c5ac622510 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 9 Sep 2015 15:37:04 +0000 Subject: [PATCH 7/9] Merged BRANCHES/V2.2.1.x to V2.2: 103185: RM-2162: Records Management patch RMv22DODModelSeparationModulePatch taking too long with large amount of records git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco-global.properties | 10 ++ .../model/recordsModel.xml | 67 +++++++++ .../patch/rm-patch-v22-context.xml | 8 +- .../dod5015/DOD5015Model.java | 2 + .../email/CustomEmailMappingServiceImpl.java | 10 +- .../patch/AbstractModulePatch.java | 12 +- .../patch/v22/RMv22DODCompliantSitePatch.java | 40 ++++-- .../RMv22DODModelSeparationModulePatch.java | 133 +++++++++++------- 8 files changed, 203 insertions(+), 79 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties index 1270de1af6..c7dd143366 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties @@ -52,3 +52,13 @@ rm.dispositionlifecycletrigger.cronexpression=0 0/5 * * * ? # Indicates whether mandatory properties are checked before completing a record # rm.completerecord.mandatorypropertiescheck.enabled=true + +# +# Indicates whether the existing file plan is converted to a standard file plan during +# upgrade to V2.2, otherwise it will be converted to a DoD compliant file plan. +# +# Note that when converted to a standard file plan that DoD related record meta-data remains +# on the individual records and will not be visible in the UI, but can be assessed via +# deprecated model properties in the rma namespace. +# +rm.patch.v22.convertToStandardFilePlan=false diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml index 981675198a..e4957c7b11 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml @@ -735,6 +735,73 @@ d:text true + + + + + + + d:date + false + + + d:text + false + + true + false + false + + + + d:text + false + + true + false + false + + + + d:text + false + + true + false + false + + + + d:text + false + + true + false + false + + + + d:date + false + + + d:text + false + + true + false + false + + + + d:text + false + + true + false + false + + diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml index a9f5b2c601..ebe66b66e7 100755 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v22-context.xml @@ -4,7 +4,6 @@ - @@ -32,9 +31,9 @@ - + + - + @@ -101,6 +101,6 @@ - + \ No newline at end of file diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java index 539add123f..3fcc87ac46 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dod5015/DOD5015Model.java @@ -46,6 +46,8 @@ public interface DOD5015Model QName PROP_MEDIA_TYPE = QName.createQName(DOD_URI, "mediaType"); QName PROP_FORMAT = QName.createQName(DOD_URI, "format"); QName PROP_DATE_RECEIVED = QName.createQName(DOD_URI, "dateReceived"); + QName PROP_ADDRESS = QName.createQName(DOD_URI, "address"); + QName PROP_OTHER_ADDRESS = QName.createQName(DOD_URI, "otherAddress"); // Scanned Record QName ASPECT_SCANNED_RECORD = QName.createQName(DOD_URI, "scannedRecord"); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java index 54aaacea30..904e9e50c0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingServiceImpl.java @@ -72,11 +72,11 @@ public class CustomEmailMappingServiceImpl extends AbstractLifecycleBean impleme /** Default custom mappings (TODO move to spring config) */ private static final CustomMapping[] DEFAULT_MAPPINGS = { - new CustomMapping("Date", "rma:dateReceived"), - new CustomMapping("messageTo", "rma:address"), - new CustomMapping("messageFrom", "rma:originator"), - new CustomMapping("messageSent", "rma:publicationDate"), - new CustomMapping("messageCc", "rma:otherAddress") + new CustomMapping("Date", "dod:dateReceived"), + new CustomMapping("messageTo", "dod:address"), + new CustomMapping("messageFrom", "dod:originator"), + new CustomMapping("messageSent", "dod:publicationDate"), + new CustomMapping("messageCc", "dod:otherAddress") }; /** Extractor */ diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/AbstractModulePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/AbstractModulePatch.java index 54f526acb3..c3bed75b30 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/AbstractModulePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/AbstractModulePatch.java @@ -18,6 +18,8 @@ */ package org.alfresco.module.org_alfresco_module_rm.patch; +import java.util.concurrent.TimeUnit; + import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.transaction.TransactionService; import org.apache.commons.logging.Log; @@ -73,12 +75,12 @@ public abstract class AbstractModulePatch implements ModulePatch, BeanNameAware modulePatchExecuter.register(this); } - protected void setTxnReadOnly(boolean txnReadOnly) + public void setTxnReadOnly(boolean txnReadOnly) { this.txnReadOnly = txnReadOnly; } - protected void setTxnRequiresNew(boolean txnRequiresNew) + public void setTxnRequiresNew(boolean txnRequiresNew) { this.txnRequiresNew = txnRequiresNew; } @@ -229,15 +231,19 @@ public abstract class AbstractModulePatch implements ModulePatch, BeanNameAware ",target=" + targetSchema); } + long startTime = System.nanoTime(); + // do patch in transaction transactionService.getRetryingTransactionHelper().doInTransaction( new ApplyCallback(), txnReadOnly, txnRequiresNew); + + long elapsedTime = System.nanoTime() - startTime; if (LOGGER.isInfoEnabled()) { - LOGGER.info(" ... module patch applied"); + LOGGER.info(" ... module patch applied in " + TimeUnit.NANOSECONDS.toMillis(elapsedTime) + "ms"); } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODCompliantSitePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODCompliantSitePatch.java index e034b626ef..6d5cd5d907 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODCompliantSitePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODCompliantSitePatch.java @@ -36,6 +36,9 @@ public class RMv22DODCompliantSitePatch extends AbstractModulePatch { /** QName DAO */ private QNameDAO qnameDAO; + + /** indicates whether we convert to a standard file plan or not */ + private boolean convertToStandardFilePlan = false; /** * @param qnameDAO QName DAO @@ -45,24 +48,35 @@ public class RMv22DODCompliantSitePatch extends AbstractModulePatch this.qnameDAO = qnameDAO; } + /** + * @param convertToStandardFilePlan convert to standard file if true, false otherwise + */ + public void setConvertToStandardFilePlan(boolean convertToStandardFilePlan) + { + this.convertToStandardFilePlan = convertToStandardFilePlan; + } + /** * @see org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch#applyInternal() */ @Override public void applyInternal() { - // ensure all existing sites are of the correct type - if (qnameDAO.getQName(RecordsManagementModel.TYPE_RM_SITE) != null && - qnameDAO.getQName(DOD5015Model.TYPE_DOD_5015_SITE) == null) - { - qnameDAO.updateQName(RecordsManagementModel.TYPE_RM_SITE, DOD5015Model.TYPE_DOD_5015_SITE); - } - - // ensure all the existing file plans are of the correct type - if (qnameDAO.getQName(RecordsManagementModel.TYPE_FILE_PLAN) != null && - qnameDAO.getQName(DOD5015Model.TYPE_DOD_5015_FILE_PLAN) == null) - { - qnameDAO.updateQName(RecordsManagementModel.TYPE_FILE_PLAN, DOD5015Model.TYPE_DOD_5015_FILE_PLAN); - } + if (!convertToStandardFilePlan) + { + // ensure all existing sites are of the correct type + if (qnameDAO.getQName(RecordsManagementModel.TYPE_RM_SITE) != null && + qnameDAO.getQName(DOD5015Model.TYPE_DOD_5015_SITE) == null) + { + qnameDAO.updateQName(RecordsManagementModel.TYPE_RM_SITE, DOD5015Model.TYPE_DOD_5015_SITE); + } + + // ensure all the existing file plans are of the correct type + if (qnameDAO.getQName(RecordsManagementModel.TYPE_FILE_PLAN) != null && + qnameDAO.getQName(DOD5015Model.TYPE_DOD_5015_FILE_PLAN) == null) + { + qnameDAO.updateQName(RecordsManagementModel.TYPE_FILE_PLAN, DOD5015Model.TYPE_DOD_5015_FILE_PLAN); + } + } } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODModelSeparationModulePatch.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODModelSeparationModulePatch.java index 5df14828f2..b2b0296f37 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODModelSeparationModulePatch.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/RMv22DODModelSeparationModulePatch.java @@ -20,7 +20,6 @@ package org.alfresco.module.org_alfresco_module_rm.patch.v22; import java.io.Serializable; import java.util.Collections; -import java.util.List; import java.util.Map; import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model; @@ -28,7 +27,8 @@ import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch; import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.patch.PatchDAO; -import org.alfresco.repo.domain.qname.QNameDAO; +import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; +import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; import org.alfresco.util.Pair; @@ -43,9 +43,9 @@ public class RMv22DODModelSeparationModulePatch extends AbstractModulePatch { /** query batch size */ private static final long BATCH_SIZE = 100000L; - - /** QName DAO */ - private QNameDAO qnameDAO; + + /** indicates whether we convert to a standard file plan or not */ + private boolean convertToStandardFilePlan = false; /** Patch DAO */ private PatchDAO patchDAO; @@ -61,16 +61,18 @@ public class RMv22DODModelSeparationModulePatch extends AbstractModulePatch DOD5015Model.PROP_PUBLICATION_DATE, DOD5015Model.PROP_MEDIA_TYPE, DOD5015Model.PROP_FORMAT, - DOD5015Model.PROP_DATE_RECEIVED + DOD5015Model.PROP_DATE_RECEIVED, + DOD5015Model.PROP_ADDRESS, + DOD5015Model.PROP_OTHER_ADDRESS }; - + /** - * @param qnameDAO QName DAO + * @param convertToStandardFilePlan convert to standard file if true, false otherwise */ - public void setQnameDAO(QNameDAO qnameDAO) + public void setConvertToStandardFilePlan(boolean convertToStandardFilePlan) { - this.qnameDAO = qnameDAO; - } + this.convertToStandardFilePlan = convertToStandardFilePlan; + } /** * @param patchDAO patch DAO @@ -94,50 +96,73 @@ public class RMv22DODModelSeparationModulePatch extends AbstractModulePatch @Override public void applyInternal() { - Long maxNodeId = patchDAO.getMaxAdmNodeID(); - long recordCount = patchDAO.getCountNodesWithAspects(Collections.singleton(ASPECT_RECORD)); - if (LOGGER.isDebugEnabled()) - { - LOGGER.debug(" ... updating " + recordCount + " records"); - } + if (!convertToStandardFilePlan) + { + Long maxNodeId = patchDAO.getMaxAdmNodeID(); + long recordCount = patchDAO.getCountNodesWithAspects(Collections.singleton(ASPECT_RECORD)); + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug(" ... updating " + recordCount + " records in batches of " + BATCH_SIZE); + } + + // apply the DOD record aspect to all exiting records + int completed = 0; + for (Long i = 0L; i < maxNodeId; i+=BATCH_SIZE) + { + final Long finali = i; + Integer batchCount = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback() + { + int batchCount = 0; + + public Integer execute() throws Throwable + { + nodeDAO.getNodesWithAspects(Collections.singleton(ASPECT_RECORD), finali, finali + BATCH_SIZE, new NodeDAO.NodeRefQueryCallback() + { + public boolean handle(Pair nodePair) + { + // get the records properties + Map properties = nodeDAO.getNodeProperties(nodePair.getFirst()); + boolean changed = false; - // apply the DOD record aspect to all exiting records - int completed = 0; - Pair recordAspect = qnameDAO.getQName(ASPECT_RECORD); - if (recordAspect != null) - { - for (Long i = 0L; i < maxNodeId; i+=BATCH_SIZE) - { - List nodeIds = patchDAO.getNodesByAspectQNameId(recordAspect.getFirst(), i, i + BATCH_SIZE); - for (Long nodeId : nodeIds) - { - // get the records properties - Map properties = nodeDAO.getNodeProperties(nodeId); - - for (QName qname : qnames) - { - // if the record has any of the moved properties - QName origional = QName.createQName(RecordsManagementModel.RM_URI, qname.getLocalName()); - if (properties.containsKey(origional)) - { - // move the property value - Serializable value = properties.get(origional); - properties.put(qname, value); - properties.remove(origional); - } - } - - // set properties and add aspect - nodeDAO.setNodeProperties(nodeId, properties); - nodeDAO.addNodeAspects(nodeId, Collections.singleton(DOD5015Model.ASPECT_DOD_5015_RECORD)); - } + for (QName qname : qnames) + { + // if the record has any of the moved properties + QName origional = QName.createQName(RecordsManagementModel.RM_URI, qname.getLocalName()); + if (properties.containsKey(origional)) + { + // move the property value + Serializable value = properties.get(origional); + properties.put(qname, value); + properties.remove(origional); + changed = true; + } + } - completed += completed + nodeIds.size(); - if (LOGGER.isDebugEnabled()) - { - LOGGER.debug(" ... completed " + completed + " of " + recordCount); - } - } - } + // set properties and add aspect + if (changed) + { + nodeDAO.setNodeProperties(nodePair.getFirst(), properties); + } + nodeDAO.addNodeAspects(nodePair.getFirst(), Collections.singleton(DOD5015Model.ASPECT_DOD_5015_RECORD)); + batchCount ++; + + return true; + } + }); + + return batchCount; + } + } , false, true); + + if (batchCount != 0) + { + completed = completed + batchCount; + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug(" ... completed " + completed + " of " + recordCount); + } + } + } + } } } From 0e8ca619176859133d4550fe705702fd15dc58f3 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 22 Sep 2015 07:04:30 +0000 Subject: [PATCH 8/9] Update module version to 2.1.2 after merge of hot fix branch. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@112549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/module/org_alfresco_module_rm/module.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties index 289d2b1f83..90c598dbb0 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties @@ -6,6 +6,6 @@ module.aliases=org_alfresco_module_dod5015 module.title=Records Management module.description=Alfresco Record Management Extension -module.version=2.1.0.4 +module.version=2.1.2 module.repo.version.min=4.2 \ No newline at end of file From 4f0b20c284a51aebe98437a7363206f11fbe9deb Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 22 Sep 2015 07:09:42 +0000 Subject: [PATCH 9/9] Merged BRANCHES/V2.1 to BRANCHES/V2.2: 112549: Update module version to 2.1.2 after merge of hot fix branch. Result of merge is to update module version to 2.2.2. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@112550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/module/org_alfresco_module_rm/module.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties index ece629124a..3b2812d6e9 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module.properties @@ -6,6 +6,6 @@ module.aliases=org_alfresco_module_dod5015 module.title=Records Management module.description=Alfresco Record Management Extension -module.version=2.2.1 +module.version=2.2.2 module.repo.version.min=4.2 \ No newline at end of file