From a7428c134fe25fd8d2f2deec4d5d2b3d1f1b2365 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu Date: Tue, 26 Apr 2016 18:06:11 +0300 Subject: [PATCH 01/17] RM-3060 - making cut Off action available for record linked to folder with the same disposition schedule --- .../disposition/DispositionServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 95f0aae459..04455015dd 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 @@ -889,6 +889,13 @@ public class DispositionServiceImpl extends ServiceBaseImpl // Get the current action String currentADId = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION_ID); currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId); + // When the record has multiple disposition schedules the current disposition action may not be found by id + // In this case it will be searched by name + if(currentDispositionActionDefinition == null) + { + String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); + currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); + } // Get the next disposition action int index = currentDispositionActionDefinition.getIndex(); From f4ac24d41f1b5382ebb1ad9009f1e9500eb93f17 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Tue, 31 May 2016 14:50:27 +0300 Subject: [PATCH 02/17] Added integration test. --- .../UpdateNextDispositionActionTest.java | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java new file mode 100644 index 0000000000..b9d4900133 --- /dev/null +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -0,0 +1,147 @@ +/* + * #%L + * Alfresco Records Management Module + * %% + * Copyright (C) 2005 - 2016 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.module.org_alfresco_module_rm.test.integration.disposition; + +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_INSTRUCTIONS; +import static org.alfresco.util.GUID.generate; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction; +import org.alfresco.module.org_alfresco_module_rm.action.impl.DestroyAction; +import org.alfresco.module.org_alfresco_module_rm.action.impl.TransferAction; +import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; +import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; +import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; +import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils; +import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.namespace.QName; +import org.springframework.extensions.webscripts.GUID; + +/** +* Update next disposition step integration tests. +* +* @author Roxana Lucanu +* @since 2.4.1 +*/ + +public class UpdateNextDispositionActionTest extends BaseRMTestCase +{ + + /** + * Given a record with multiple dispositions + * When updating the next step + * Then the action is available + *

+ * relates to https://issues.alfresco.com/jira/browse/RM-3060 + */ + public void testUpdateNextDispositionAction_RM3060() throws Exception + { + doBehaviourDrivenTest(new BehaviourDrivenTest() + { + NodeRef record; + + @Override + public void given() + { + // create first category + NodeRef category1 = filePlanService.createRecordCategory(filePlan, generate()); + // create disposition schedule for category1 + DispositionSchedule ds1 = utils.createDispositionSchedule(category1, DEFAULT_DISPOSITION_INSTRUCTIONS, + "ds1", true, false, false); + + // create the properties for CUTOFF action + Map adCutOff = new HashMap(3); + adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); + adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "CutOffDesc"); + adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); + + dispositionService.addDispositionActionDefinition(ds1, adCutOff); + + // create the properties for TRANSFER action + Map adTransfer = new HashMap(3); + adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); + adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "TransferDesc"); + List eventsList = new ArrayList(1); + eventsList.add("study_complete"); + adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_EVENT, (Serializable)eventsList); + + dispositionService.addDispositionActionDefinition(ds1, adTransfer); + + // create the properties for DESTROY action + Map adDestroy = new HashMap(3); + adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); + adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "DestroyDesc"); + adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, "week|1"); + + dispositionService.addDispositionActionDefinition(ds1, adDestroy); + + // create folder1 > record inside category1 + NodeRef firstFolder = recordFolderService.createRecordFolder(category1, GUID.generate()); + record = utils.createRecord(firstFolder, GUID.generate(), "title"); + + // create second category + NodeRef category2 = filePlanService.createRecordCategory(filePlan, generate()); + // create disposition schedule for category2 + DispositionSchedule ds2 = utils.createDispositionSchedule(category2, DEFAULT_DISPOSITION_INSTRUCTIONS, + "ds2", true, false, true); + // add disposition actions + dispositionService.addDispositionActionDefinition(ds2, adCutOff); + dispositionService.addDispositionActionDefinition(ds2, adTransfer); + dispositionService.addDispositionActionDefinition(ds2, adDestroy); + + // create folder2 inside category2 + NodeRef folder2 = recordFolderService.createRecordFolder(category2, GUID.generate()); + + // link the record to folder2 + recordService.link(record, folder2); + + // complete record + utils.completeRecord(record); + } + + @Override + public void when() + { + // complete event + rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); + } + + @Override + public void then() + { + // ensure the record folder is cut off + assertTrue(dispositionService.isDisposableItemCutoff(record)); + } + }); + + } +} From e9bb18f9f5d33814403a0abb071a1c80a5544481 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Wed, 1 Jun 2016 17:41:36 +0300 Subject: [PATCH 03/17] Changed test class and commented initial fix. --- .../disposition/DispositionServiceImpl.java | 10 +- .../UpdateNextDispositionActionTest.java | 108 ++++++++---------- 2 files changed, 54 insertions(+), 64 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 04455015dd..76d476b8f4 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 @@ -891,11 +891,11 @@ public class DispositionServiceImpl extends ServiceBaseImpl currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId); // When the record has multiple disposition schedules the current disposition action may not be found by id // In this case it will be searched by name - if(currentDispositionActionDefinition == null) - { - String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); - currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); - } +// if(currentDispositionActionDefinition == null) +// { +// String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); +// currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); +// } // Get the next disposition action int index = currentDispositionActionDefinition.getIndex(); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java index b9d4900133..edd76ccdbf 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -26,25 +26,22 @@ */ package org.alfresco.module.org_alfresco_module_rm.test.integration.disposition; +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_DESCRIPTION; import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_INSTRUCTIONS; +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.PERIOD_IMMEDIATELY; import static org.alfresco.util.GUID.generate; import java.io.Serializable; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.DestroyAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.TransferAction; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; -import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; -import org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; -import org.springframework.extensions.webscripts.GUID; /** * Update next disposition step integration tests. @@ -52,10 +49,8 @@ import org.springframework.extensions.webscripts.GUID; * @author Roxana Lucanu * @since 2.4.1 */ - public class UpdateNextDispositionActionTest extends BaseRMTestCase { - /** * Given a record with multiple dispositions * When updating the next step @@ -68,59 +63,36 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase doBehaviourDrivenTest(new BehaviourDrivenTest() { NodeRef record; + NodeRef folder2; @Override public void given() { - // create first category + // create category1 NodeRef category1 = filePlanService.createRecordCategory(filePlan, generate()); + // create disposition schedule for category1 - DispositionSchedule ds1 = utils.createDispositionSchedule(category1, DEFAULT_DISPOSITION_INSTRUCTIONS, - "ds1", true, false, false); + createDispositionSchedule(category1); - // create the properties for CUTOFF action - Map adCutOff = new HashMap(3); - adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); - adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "CutOffDesc"); - adCutOff.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY); - - dispositionService.addDispositionActionDefinition(ds1, adCutOff); - - // create the properties for TRANSFER action - Map adTransfer = new HashMap(3); - adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); - adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "TransferDesc"); - List eventsList = new ArrayList(1); - eventsList.add("study_complete"); - adTransfer.put(RecordsManagementModel.PROP_DISPOSITION_EVENT, (Serializable)eventsList); - - dispositionService.addDispositionActionDefinition(ds1, adTransfer); - - // create the properties for DESTROY action - Map adDestroy = new HashMap(3); - adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); - adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_DESCRIPTION, "DestroyDesc"); - adDestroy.put(RecordsManagementModel.PROP_DISPOSITION_PERIOD, "week|1"); - - dispositionService.addDispositionActionDefinition(ds1, adDestroy); - - // create folder1 > record inside category1 - NodeRef firstFolder = recordFolderService.createRecordFolder(category1, GUID.generate()); - record = utils.createRecord(firstFolder, GUID.generate(), "title"); - - // create second category + // create category2 NodeRef category2 = filePlanService.createRecordCategory(filePlan, generate()); + // create disposition schedule for category2 - DispositionSchedule ds2 = utils.createDispositionSchedule(category2, DEFAULT_DISPOSITION_INSTRUCTIONS, - "ds2", true, false, true); - // add disposition actions - dispositionService.addDispositionActionDefinition(ds2, adCutOff); - dispositionService.addDispositionActionDefinition(ds2, adTransfer); - dispositionService.addDispositionActionDefinition(ds2, adDestroy); + createDispositionSchedule(category2); // create folder2 inside category2 - NodeRef folder2 = recordFolderService.createRecordFolder(category2, GUID.generate()); + folder2 = recordFolderService.createRecordFolder(category2, generate()); + // create folder1 inside category1 + NodeRef folder1 = recordFolderService.createRecordFolder(category1, generate()); + + // create record inside folder1 + record = utils.createRecord(folder1, generate(), generate()); + } + + @Override + public void when() + { // link the record to folder2 recordService.link(record, folder2); @@ -129,19 +101,37 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase } @Override - public void when() + public void then() throws Exception { - // complete event + // cut off rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); } - - @Override - public void then() - { - // ensure the record folder is cut off - assertTrue(dispositionService.isDisposableItemCutoff(record)); - } }); - } -} + + private void createDispositionSchedule(NodeRef category) + { + DispositionSchedule ds = utils.createDispositionSchedule(category, DEFAULT_DISPOSITION_INSTRUCTIONS, DEFAULT_DISPOSITION_DESCRIPTION, true, false, false); + + // create the properties for CUTOFF action and add it to the disposition action definition + Map cutOff = new HashMap(3); + cutOff.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); + cutOff.put(PROP_DISPOSITION_DESCRIPTION, generate()); + cutOff.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + dispositionService.addDispositionActionDefinition(ds, cutOff); + + // create the properties for TRANSFER action and add it to the disposition action definition + Map transfer = new HashMap(3); + transfer.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); + transfer.put(PROP_DISPOSITION_DESCRIPTION, generate()); + transfer.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + dispositionService.addDispositionActionDefinition(ds, transfer); + + // create the properties for DESTROY action and add it to the disposition action definition + Map destroy = new HashMap(3); + destroy.put(PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); + destroy.put(PROP_DISPOSITION_DESCRIPTION, generate()); + destroy.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + dispositionService.addDispositionActionDefinition(ds, destroy); + } +} \ No newline at end of file From c6c9edf306a39bc892585f4f137bcf9b294ffc90 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Fri, 3 Jun 2016 11:10:18 +0300 Subject: [PATCH 04/17] Added check to allow creating only records inside a record folder. --- .../model/rma/type/RecordFolderType.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java index 6c3aaafc87..668bf2aa73 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java @@ -31,6 +31,7 @@ import java.io.Serializable; import java.util.Map; import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.model.behaviour.AbstractDisposableItem; import org.alfresco.module.org_alfresco_module_rm.record.RecordService; import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService; @@ -211,12 +212,18 @@ public class RecordFolderType extends AbstractDisposableItem public void onCreateChildAssociation(ChildAssociationRef childAssocRef, boolean bNew) { NodeRef nodeRef = childAssocRef.getChildRef(); - if (nodeService.exists(nodeRef) && instanceOf(nodeRef, TYPE_RECORD_FOLDER)) + + if (nodeService.exists(nodeRef)) { + // only records can be added in a record folder + if (!instanceOf(nodeRef, ContentModel.TYPE_CONTENT)) + { + throw new AlfrescoRuntimeException("Operation failed, because you can only place content into a record folder."); + } // ensure nothing is being added to a closed record folder NodeRef recordFolder = childAssocRef.getParentRef(); Boolean isClosed = (Boolean) nodeService.getProperty(recordFolder, PROP_IS_CLOSED); - if (isClosed != null && Boolean.TRUE.equals(isClosed)) + if (isClosed != null && isClosed) { throw new AlfrescoRuntimeException("You can't add new items to a closed record folder."); } From 3d74c81abc6bf3411b9f33975a4232d6b608ae84 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Mon, 6 Jun 2016 10:25:46 +0300 Subject: [PATCH 05/17] Moved check for content to be done on commit. --- .../model/rma/type/RecordFolderType.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java index 668bf2aa73..7d2aff1e47 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java @@ -215,11 +215,6 @@ public class RecordFolderType extends AbstractDisposableItem if (nodeService.exists(nodeRef)) { - // only records can be added in a record folder - if (!instanceOf(nodeRef, ContentModel.TYPE_CONTENT)) - { - throw new AlfrescoRuntimeException("Operation failed, because you can only place content into a record folder."); - } // ensure nothing is being added to a closed record folder NodeRef recordFolder = childAssocRef.getParentRef(); Boolean isClosed = (Boolean) nodeService.getProperty(recordFolder, PROP_IS_CLOSED); @@ -245,6 +240,12 @@ public class RecordFolderType extends AbstractDisposableItem { final NodeRef recordFolder = childAssocRef.getChildRef(); + // only records can be added in a record folder or hidden folders(is the case of e-mail attachments) + if (!instanceOf(recordFolder, ContentModel.TYPE_CONTENT) && !nodeService.hasAspect(recordFolder, ContentModel.ASPECT_HIDDEN)) + { + throw new AlfrescoRuntimeException("Operation failed, because you can only place content into a record folder."); + } + behaviourFilter.disableBehaviour(); try { From 563cae7555c8793921323cd52be97b5cc7852c0b Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 9 Jun 2016 13:53:07 +1000 Subject: [PATCH 06/17] Changes to integration to better reflect the scenario to be tested --- .../EditDispositionActionAsOfDateAction.java | 3 ++ .../UpdateNextDispositionActionTest.java | 33 ++++++++++++------- .../test/util/CommonRMTestUtils.java | 1 + 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java index d7ff27e995..071b3a2da2 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/EditDispositionActionAsOfDateAction.java @@ -47,6 +47,9 @@ public class EditDispositionActionAsOfDateAction extends RMActionExecuterAbstrac private static final String MSG_VALID_DATE_DISP_ASOF = "rm.action.valid-date-disp-asof"; private static final String MSG_DISP_ASOF_LIFECYCLE_APPLIED = "rm.action.disp-asof-lifecycle-applied"; + /** Action name */ + public static final String NAME = "editDispositionActionAsOfDate"; + /** Action parameters */ public static final String PARAM_AS_OF_DATE = "asOfDate"; diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java index edd76ccdbf..9e63033e32 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -28,15 +28,19 @@ package org.alfresco.module.org_alfresco_module_rm.test.integration.disposition; import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_DESCRIPTION; import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_INSTRUCTIONS; -import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.PERIOD_IMMEDIATELY; +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_EVENT_NAME; +import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.PERIOD_ONE_WEEK; import static org.alfresco.util.GUID.generate; import java.io.Serializable; +import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.Map; import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.DestroyAction; +import org.alfresco.module.org_alfresco_module_rm.action.impl.EditDispositionActionAsOfDateAction; import org.alfresco.module.org_alfresco_module_rm.action.impl.TransferAction; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase; @@ -88,23 +92,30 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase // create record inside folder1 record = utils.createRecord(folder1, generate(), generate()); - } - - @Override - public void when() - { + // link the record to folder2 recordService.link(record, folder2); // complete record utils.completeRecord(record); + + // set the disposition as of date to now on the record + rmActionService.executeRecordsManagementAction(record, + EditDispositionActionAsOfDateAction.NAME, + Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date())); + } + + @Override + public void when() + { + // cut off + rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); } @Override public void then() throws Exception { - // cut off - rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); + assertTrue(nodeService.hasAspect(record, ASPECT_CUT_OFF)); } }); } @@ -117,21 +128,21 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase Map cutOff = new HashMap(3); cutOff.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME); cutOff.put(PROP_DISPOSITION_DESCRIPTION, generate()); - cutOff.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + cutOff.put(PROP_DISPOSITION_PERIOD, PERIOD_ONE_WEEK); dispositionService.addDispositionActionDefinition(ds, cutOff); // create the properties for TRANSFER action and add it to the disposition action definition Map transfer = new HashMap(3); transfer.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME); transfer.put(PROP_DISPOSITION_DESCRIPTION, generate()); - transfer.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + transfer.put(PROP_DISPOSITION_EVENT, (Serializable)Collections.singletonList(DEFAULT_EVENT_NAME)); dispositionService.addDispositionActionDefinition(ds, transfer); // create the properties for DESTROY action and add it to the disposition action definition Map destroy = new HashMap(3); destroy.put(PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME); destroy.put(PROP_DISPOSITION_DESCRIPTION, generate()); - destroy.put(PROP_DISPOSITION_PERIOD, PERIOD_IMMEDIATELY); + destroy.put(PROP_DISPOSITION_PERIOD, PERIOD_ONE_WEEK); dispositionService.addDispositionActionDefinition(ds, destroy); } } \ No newline at end of file diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java index 8f4ddd7969..1938535988 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/CommonRMTestUtils.java @@ -86,6 +86,7 @@ public class CommonRMTestUtils implements RecordsManagementModel public static final String DEFAULT_EVENT_NAME = "case_closed"; public static final String PERIOD_NONE = "none|0"; public static final String PERIOD_IMMEDIATELY = "immediately|0"; + public static final String PERIOD_ONE_WEEK = "week|1"; /** * Constructor From 85b965dea9302a51a4806fe2db578b2ae85d37f5 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Thu, 16 Jun 2016 15:50:35 +0300 Subject: [PATCH 07/17] Changed the test a bit and uncommented intial fix, as we agree it's an workaround for the moment. --- .../disposition/DispositionServiceImpl.java | 10 +++++----- .../UpdateNextDispositionActionTest.java | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 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 76d476b8f4..04455015dd 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 @@ -891,11 +891,11 @@ public class DispositionServiceImpl extends ServiceBaseImpl currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId); // When the record has multiple disposition schedules the current disposition action may not be found by id // In this case it will be searched by name -// if(currentDispositionActionDefinition == null) -// { -// String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); -// currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); -// } + if(currentDispositionActionDefinition == null) + { + String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION); + currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName); + } // Get the next disposition action int index = currentDispositionActionDefinition.getIndex(); diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java index 9e63033e32..462198f5a7 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/UpdateNextDispositionActionTest.java @@ -92,24 +92,24 @@ public class UpdateNextDispositionActionTest extends BaseRMTestCase // create record inside folder1 record = utils.createRecord(folder1, generate(), generate()); - + + } + @Override + public void when() throws Exception + { // link the record to folder2 recordService.link(record, folder2); // complete record utils.completeRecord(record); - + // set the disposition as of date to now on the record rmActionService.executeRecordsManagementAction(record, - EditDispositionActionAsOfDateAction.NAME, - Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date())); - } + EditDispositionActionAsOfDateAction.NAME, + Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date())); - @Override - public void when() - { // cut off - rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); + rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null); } @Override From a431e84f8e558362d4b7b8ea0ed6ca9b7ac9db15 Mon Sep 17 00:00:00 2001 From: Roxana Lucanu-Ghetu Date: Fri, 17 Jun 2016 12:05:19 +0300 Subject: [PATCH 08/17] Created a property for AlfrescoRuntimeException instead ot the message. --- .../messages/action-service.properties | 3 ++- .../model/rma/type/RecordFolderType.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service.properties index 5c6a7d4daf..dbb53e0559 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service.properties @@ -36,4 +36,5 @@ rm.action.records_only_undeclared=Only records can be completed. rm.action.event-not-undone=The event {0} can't be undone, because it's not defined on the disposition lifecycle. rm.action.node-not-record-category=The disposition schedule could not be created, because the actioned upon node ({0}) was not a record category. rm.action.parameter-not-supplied=The parameter ''{0}'' has not been supplied. -rm.action.delete-not-hold-type=The hold couldn't be deleted, because the node isn't of type {0}. (actionedUponNodeRef={1}) \ No newline at end of file +rm.action.delete-not-hold-type=The hold couldn't be deleted, because the node isn't of type {0}. (actionedUponNodeRef={1}) +rm.action.record-folder-create=Operation failed, because you can't place a record folder into another record folder. diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java index 7d2aff1e47..5974c922a6 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordFolderType.java @@ -50,6 +50,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.namespace.QName; import org.apache.commons.lang.ArrayUtils; +import org.springframework.extensions.surf.util.I18NUtil; /** * rma:recordFolder behaviour bean @@ -74,6 +75,9 @@ public class RecordFolderType extends AbstractDisposableItem /** vital record service */ protected VitalRecordService vitalRecordService; + /** I18N */ + private static final String MSG_CANNOT_CREATE_RECORD_FOLDER = "rm.action.record-folder-create"; + /** * @param recordService record service */ @@ -243,7 +247,7 @@ public class RecordFolderType extends AbstractDisposableItem // only records can be added in a record folder or hidden folders(is the case of e-mail attachments) if (!instanceOf(recordFolder, ContentModel.TYPE_CONTENT) && !nodeService.hasAspect(recordFolder, ContentModel.ASPECT_HIDDEN)) { - throw new AlfrescoRuntimeException("Operation failed, because you can only place content into a record folder."); + throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_CANNOT_CREATE_RECORD_FOLDER)); } behaviourFilter.disableBehaviour(); From 259ed57063b68b49c96ad1a0b185b7cb8110566a Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Tue, 28 Jun 2016 16:20:18 +0100 Subject: [PATCH 09/17] Get rid od alfresco.rm.version --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cb57c19c48..414621135e 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,6 @@ - ${project.version} AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE false 1.7 @@ -146,7 +145,7 @@ rm.module.version - ${alfresco.rm.version} + ${project.version} (\d+)\.(\d+).* $1.$2 false From 3cd7eb7bc19038382ec275b3552c4919499cb3c2 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Tue, 28 Jun 2016 16:28:00 +0100 Subject: [PATCH 10/17] Put alfresco.rm.version back in top-level only --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 414621135e..7614faae8c 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,7 @@ + ${project.version} AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE false 1.7 From d62d0bbcdd7d46a07f76731a2808d6a8ae4bbff4 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Tue, 28 Jun 2016 16:28:20 +0100 Subject: [PATCH 11/17] [maven-release-plugin] rollback the release of V2.5-EA1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7614faae8c..cb57c19c48 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ rm.module.version - ${project.version} + ${alfresco.rm.version} (\d+)\.(\d+).* $1.$2 false From 3c906f6e909d8145d43e96fdbd209e053e03e6f5 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Tue, 28 Jun 2016 16:56:29 +0100 Subject: [PATCH 12/17] Remove alfresco.rm.version property and use project.version instead, so the maven-release-plugin works --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cb57c19c48..414621135e 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,6 @@ - ${project.version} AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE false 1.7 @@ -146,7 +145,7 @@ rm.module.version - ${alfresco.rm.version} + ${project.version} (\d+)\.(\d+).* $1.$2 false From 4c958e5a1acee562b3fef7f195d93fa50d1a0854 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 28 Jun 2016 17:59:23 +0100 Subject: [PATCH 13/17] [maven-release-plugin] prepare release V2.5-EA1 --- pom.xml | 690 +++++++++++------------ rm-automation/pom.xml | 721 ++++++++++++------------- rm-community/pom.xml | 56 +- rm-community/rm-community-repo/pom.xml | 84 +-- 4 files changed, 775 insertions(+), 776 deletions(-) diff --git a/pom.xml b/pom.xml index 414621135e..a86e74e8cf 100644 --- a/pom.xml +++ b/pom.xml @@ -1,345 +1,345 @@ - - - 4.0.0 - org.alfresco - alfresco-rm - pom - 2.5-SNAPSHOT - Alfresco Records Management - - - org.alfresco.maven - alfresco-sdk-parent - 2.1.1 - - - http://www.alfresco.org/ - 2005 - - Alfresco Software - http://www.alfresco.org/ - - - - scm:git:https://gitlab.alfresco.com/records-management/records-management.git - scm:git:https://gitlab.alfresco.com/records-management/records-management.git - https://gitlab.alfresco.com/records-management/records-management - HEAD - - - - JIRA - https://issues.alfresco.com/jira/browse/RM - - - Bamboo - https://bamboo.alfresco.com/bamboo/browse/RM - - - - 3.2.5 - - - - - alfresco-internal - https://artifacts.alfresco.com/nexus/content/groups/private - - - - - - alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public - - - - - - alfresco-internal - https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/ - - - alfresco-internal-snapshots - https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/ - - - - - - - ${alfresco.groupId} - alfresco-platform-distribution - ${alfresco.version} - pom - import - - - org.reflections - reflections - 0.9.10 - - - - - - rm-community - rm-enterprise - rm-automation - - - - AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE - false - 1.7 - 1.8 - UTF-8 - UTF-8 - -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote - - - true - false - - - - - ${project.artifactId}-${project.version} - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - 1.8 - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - regex-properties - - regex-properties - - - - - rm.module.repo.version.min - ${alfresco.version} - (\d+)\.(\d+).* - $1.$2 - false - - - rm.module.version - ${project.version} - (\d+)\.(\d+).* - $1.$2 - false - - - - - - add-test-source - - add-test-source - - - - src/unit-test/java - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*UnitTest.java - - - - - - - - maven-compiler-plugin - ${maven.compiler.version} - - ${maven.build.sourceVersion} - ${maven.build.sourceVersion} - - - - default-testCompile - process-test-sources - - testCompile - - - ${maven.build.testSourceVersion} - ${maven.build.testSourceVersion} - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0.0,) - - enforce - - - - - - - - - - org.codehaus.mojo - - - build-helper-maven-plugin - - - [1.9.1,) - - - regex-properties - - - - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.plugin} - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.19 - - - org.codehaus.mojo - build-helper-maven-plugin - ${maven.buildhelper.version} - - - org.codehaus.mojo - sql-maven-plugin - 1.5 - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - V@{project.version} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - org.codehaus.mojo - license-maven-plugin - 1.8 - - - ${license.verbose} - false - false - - - Alfresco Software Limited - ${project.parent.parent.basedir}/license/description.ftl - true - true - - - file:${project.parent.parent.basedir}/license - - - ${license.update.dryrun} - true - true - - - - src - - - - - **/package-info.java - **/*.properties - **/*.css - **/*.xml - **/*.json - **/*.txt - **/*.html - - - - - - first - - update-file-header - - process-sources - - - - - - - + + + 4.0.0 + org.alfresco + alfresco-rm + pom + 2.5-EA1 + Alfresco Records Management + + + org.alfresco.maven + alfresco-sdk-parent + 2.1.1 + + + http://www.alfresco.org/ + 2005 + + Alfresco Software + http://www.alfresco.org/ + + + + scm:git:https://gitlab.alfresco.com/records-management/records-management.git + scm:git:https://gitlab.alfresco.com/records-management/records-management.git + https://gitlab.alfresco.com/records-management/records-management + V2.5-EA1 + + + + JIRA + https://issues.alfresco.com/jira/browse/RM + + + Bamboo + https://bamboo.alfresco.com/bamboo/browse/RM + + + + 3.2.5 + + + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/groups/private + + + + + + alfresco-public + https://artifacts.alfresco.com/nexus/content/groups/public + + + + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/ + + + alfresco-internal-snapshots + https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/ + + + + + + + ${alfresco.groupId} + alfresco-platform-distribution + ${alfresco.version} + pom + import + + + org.reflections + reflections + 0.9.10 + + + + + + rm-community + rm-enterprise + rm-automation + + + + AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE + false + 1.7 + 1.8 + UTF-8 + UTF-8 + -Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote + + + true + false + + + + + ${project.artifactId}-${project.version} + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java + + enforce + + + + + 1.8 + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + regex-properties + + regex-properties + + + + + rm.module.repo.version.min + ${alfresco.version} + (\d+)\.(\d+).* + $1.$2 + false + + + rm.module.version + ${project.version} + (\d+)\.(\d+).* + $1.$2 + false + + + + + + add-test-source + + add-test-source + + + + src/unit-test/java + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*UnitTest.java + + + + + + + + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.build.sourceVersion} + ${maven.build.sourceVersion} + + + + default-testCompile + process-test-sources + + testCompile + + + ${maven.build.testSourceVersion} + ${maven.build.testSourceVersion} + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0.0,) + + enforce + + + + + + + + + + org.codehaus.mojo + + + build-helper-maven-plugin + + + [1.9.1,) + + + regex-properties + + + + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.plugin} + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-2 + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19 + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven.buildhelper.version} + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + V@{project.version} + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + + + org.codehaus.mojo + license-maven-plugin + 1.8 + + + ${license.verbose} + false + false + + + Alfresco Software Limited + ${project.parent.parent.basedir}/license/description.ftl + true + true + + + file:${project.parent.parent.basedir}/license + + + ${license.update.dryrun} + true + true + + + + src + + + + + **/package-info.java + **/*.properties + **/*.css + **/*.xml + **/*.json + **/*.txt + **/*.html + + + + + + first + + update-file-header + + process-sources + + + + + + + diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 0721cea0c4..1fb0d7e95d 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -1,284 +1,283 @@ - - - - 4.0.0 - alfresco-rm-automation - Alfresco Records Management Automation - - - org.alfresco - alfresco-rm - 2.5-SNAPSHOT - - - - 2.45.0 - 4.0.5.RELEASE - 1.8 - testng.xml - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source - - add-test-source - - - - src/unit-test/java - - - - - - - maven-surefire-plugin - - false - - ${project.build.testOutputDirectory}/${suiteXmlFile} - - ${skip.automationtests} - - - - maven-antrun-plugin - - - default-cli - - - Stopping Alfresco... - - - - - - - - - - - - org.codehaus.mojo - license-maven-plugin - - alfresco_enterprise - file:${project.parent.basedir}/license - ${project.parent.basedir}/license/description.ftl - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - license-maven-plugin - - - [1.8,) - - - - update-file-header - - - - - - - - - - - - - - - - - - org.alfresco.test - dataprep - 1.8 - - - org.alfresco.test - alfresco-testng - 1.1 - - - org.alfresco - selenium-grid - 1.8 - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.testng - testng - 6.8.8 - - - ru.yandex.qatools.htmlelements - htmlelements-all - 1.15 - - - ru.yandex.qatools.properties - properties-loader - 1.5 - test - - - com.github.tomakehurst - wiremock - 1.56 - - - org.mockito - mockito-all - test - - - - - - install-alfresco - - - - maven-antrun-plugin - - - fetch-installer - generate-test-resources - - run - - - - Recreating database... - drop database if exists alfresco; create database alfresco - Downloading Alfresco installer... - - - - Installing Alfresco... - - - - - - - - - - org.apache.ant - ant-jsch - 1.8.2 - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - - maven-dependency-plugin - - - fetch-amps - process-test-resources - - copy - - - - - org.alfresco + + + + 4.0.0 + alfresco-rm-automation + Alfresco Records Management Automation + + + org.alfresco + alfresco-rm + 2.5-EA1 + + + + 2.45.0 + 4.0.5.RELEASE + 1.8 + testng.xml + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + + add-test-source + + + + src/unit-test/java + + + + + + + maven-surefire-plugin + + false + + ${project.build.testOutputDirectory}/${suiteXmlFile} + + ${skip.automationtests} + + + + maven-antrun-plugin + + + default-cli + + + Stopping Alfresco... + + + + + + + + + + + + org.codehaus.mojo + license-maven-plugin + + alfresco_enterprise + file:${project.parent.basedir}/license + ${project.parent.basedir}/license/description.ftl + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + license-maven-plugin + + + [1.8,) + + + + update-file-header + + + + + + + + + + + + + + + + + + org.alfresco.test + dataprep + 1.8 + + + org.alfresco.test + alfresco-testng + 1.1 + + + org.alfresco + selenium-grid + 1.8 + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + test + + + org.springframework + spring-test + ${spring.version} + test + + + org.testng + testng + 6.8.8 + + + ru.yandex.qatools.htmlelements + htmlelements-all + 1.15 + + + ru.yandex.qatools.properties + properties-loader + 1.5 + test + + + com.github.tomakehurst + wiremock + 1.56 + + + org.mockito + mockito-all + test + + + + + + install-alfresco + + + + maven-antrun-plugin + + + fetch-installer + generate-test-resources + + run + + + + Recreating database... + drop database if exists alfresco; create database alfresco + Downloading Alfresco installer... + + + + Installing Alfresco... + + + + + + + + + + org.apache.ant + ant-jsch + 1.8.2 + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + + + maven-dependency-plugin + + + fetch-amps + process-test-resources + + copy + + + + + org.alfresco alfresco-rm-community-share ${project.version} amp org.alfresco - alfresco-rm-enterprise-share + alfresco-rm-enterprise-share ${project.version} amp org.alfresco alfresco-rm-community-repo - ${project.version} - amp - - - org.alfresco - alfresco-rm-enterprise-repo - ${project.version} - amp - - - ${project.build.directory}/amps - true - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - true - - + ${project.version} + amp + + + org.alfresco + alfresco-rm-enterprise-repo + ${project.version} + amp + + + ${project.build.directory}/amps + true + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + install-community-repo-amp install @@ -291,15 +290,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs - install-enterprise-repo-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + install-enterprise-repo-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war @@ -312,86 +311,86 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs true ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - install-enterprise-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - - - - - - run-alfresco - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - prepare-jacoco - - prepare-agent - - - - - - org.alfresco.* - - - - - maven-antrun-plugin - - - start-alfresco - process-test-classes - - run - - - - Starting Alfresco... - - - - - - - - - - stop-alfresco - post-integration-test - - run - - - - Stopping Alfresco... - - - - - - - - - - - - - + + + + install-enterprise-share-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + + + + + + run-alfresco + + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + prepare-jacoco + + prepare-agent + + + + + + org.alfresco.* + + + + + maven-antrun-plugin + + + start-alfresco + process-test-classes + + run + + + + Starting Alfresco... + + + + + + + + + + stop-alfresco + post-integration-test + + run + + + + Stopping Alfresco... + + + + + + + + + + + + + diff --git a/rm-community/pom.xml b/rm-community/pom.xml index da2908c92c..1e284c563e 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -1,28 +1,28 @@ - - - 4.0.0 - alfresco-rm-community - Alfresco Records Management Community - pom - - - org.alfresco - alfresco-rm - 2.5-SNAPSHOT - - - - - LGPL 3 - - - - - rm-community-repo - rm-community-share - - - - 5.1.e - - + + + 4.0.0 + alfresco-rm-community + Alfresco Records Management Community + pom + + + org.alfresco + alfresco-rm + 2.5-EA1 + + + + + LGPL 3 + + + + + rm-community-repo + rm-community-share + + + + 5.1.e + + diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index d55da9e478..f5ec2b70a7 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -3,13 +3,13 @@ 4.0.0 alfresco-rm-community-repo Alfresco Records Management Community Repo - Alfresco Record Management Core Repository Extension + Alfresco Record Management Core Repository Extension amp org.alfresco alfresco-rm-community - 2.5-SNAPSHOT + 2.5-EA1 @@ -83,10 +83,10 @@ - + - - + + @@ -110,7 +110,7 @@ - + org.apache.maven.plugins maven-surefire-plugin @@ -205,24 +205,24 @@ - - - - org.codehaus.mojo - license-maven-plugin - - alfresco_community - - source/java - unit-test/java - source/compatibility - config - test/java - test/resources - - - - + + + + org.codehaus.mojo + license-maven-plugin + + alfresco_community + + source/java + unit-test/java + source/compatibility + config + test/java + test/resources + + + + @@ -246,17 +246,17 @@ - - org.codehaus.mojo - license-maven-plugin - [1.8,) - - update-file-header - - - - - + + org.codehaus.mojo + license-maven-plugin + [1.8,) + + update-file-header + + + + + @@ -298,8 +298,8 @@ spring-test 2.5 test - - + + ${alfresco.groupId} alfresco-repository ${alfresco.version} @@ -337,11 +337,11 @@ test - - org.reflections - reflections - test - + + org.reflections + reflections + test + From 604975fed9995df4bdf688e8993eec0faef18226 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 28 Jun 2016 17:59:26 +0100 Subject: [PATCH 14/17] [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 a86e74e8cf..1bba046707 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.5-EA1 + 2.5-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://gitlab.alfresco.com/records-management/records-management.git scm:git:https://gitlab.alfresco.com/records-management/records-management.git https://gitlab.alfresco.com/records-management/records-management - V2.5-EA1 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 1fb0d7e95d..b82cc52f1c 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5-EA1 + 2.5-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 1e284c563e..4f1f270fa3 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5-EA1 + 2.5-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index f5ec2b70a7..b6a1527ee5 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-EA1 + 2.5-SNAPSHOT From 522c6b7a0c2560eefe7df0584b97e14f8406875a Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 1 Jul 2016 22:56:45 +0100 Subject: [PATCH 15/17] Fixed audit log issue --- rm-automation/pom.xml | 740 +++++++------- rm-community/rm-community-repo/pom.xml | 1219 ++++++++++++------------ 2 files changed, 954 insertions(+), 1005 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index b82cc52f1c..28a665b4ae 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -1,396 +1,348 @@ - - - - 4.0.0 - alfresco-rm-automation - Alfresco Records Management Automation - - - org.alfresco - alfresco-rm + + + + 4.0.0 + alfresco-rm-automation + Alfresco Records Management Automation + + + org.alfresco + alfresco-rm 2.5-SNAPSHOT - - - - 2.45.0 - 4.0.5.RELEASE - 1.8 - testng.xml - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source - - add-test-source - - - - src/unit-test/java - - - - - - - maven-surefire-plugin - - false - - ${project.build.testOutputDirectory}/${suiteXmlFile} - - ${skip.automationtests} - - - - maven-antrun-plugin - - - default-cli - - - Stopping Alfresco... - - - - - - - - - - - - org.codehaus.mojo - license-maven-plugin - - alfresco_enterprise - file:${project.parent.basedir}/license - ${project.parent.basedir}/license/description.ftl - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - license-maven-plugin - - - [1.8,) - - - - update-file-header - - - - - - - - - - - - - - - - - - org.alfresco.test - dataprep - 1.8 - - - org.alfresco.test - alfresco-testng - 1.1 - - - org.alfresco - selenium-grid - 1.8 - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.testng - testng - 6.8.8 - - - ru.yandex.qatools.htmlelements - htmlelements-all + + + + 2.45.0 + 4.0.5.RELEASE + 1.8 + testng.xml + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + + add-test-source + + + + src/unit-test/java + + + + + + + maven-surefire-plugin + + false + + ${project.build.testOutputDirectory}/${suiteXmlFile} + + ${skip.automationtests} + + + + maven-antrun-plugin + + + default-cli + + + Stopping Alfresco... + + + + + + + + + + org.codehaus.mojo + license-maven-plugin + + alfresco_enterprise + file:${project.parent.basedir}/license + ${project.parent.basedir}/license/description.ftl + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + license-maven-plugin + [1.8,) + + update-file-header + + + + + + + + + + + + + + + + + org.alfresco.test + dataprep + 1.8 + + + org.alfresco.test + alfresco-testng + 1.1 + + + org.alfresco + selenium-grid + 1.8 + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + test + + + org.springframework + spring-test + ${spring.version} + test + + + org.testng + testng + 6.8.8 + + + ru.yandex.qatools.htmlelements + htmlelements-all 1.15 - - - ru.yandex.qatools.properties - properties-loader - 1.5 - test - - - com.github.tomakehurst - wiremock - 1.56 - - - org.mockito - mockito-all - test - - - - - - install-alfresco - - - - maven-antrun-plugin - - - fetch-installer - generate-test-resources - - run - - - - Recreating database... - drop database if exists alfresco; create database alfresco - Downloading Alfresco installer... - - - - Installing Alfresco... - - - - - - - - - - org.apache.ant - ant-jsch - 1.8.2 - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - - maven-dependency-plugin - - - fetch-amps - process-test-resources - - copy - - - - - org.alfresco - alfresco-rm-community-share - ${project.version} - amp - - - org.alfresco - alfresco-rm-enterprise-share - ${project.version} - amp - - - org.alfresco - alfresco-rm-community-repo - ${project.version} - amp - - - org.alfresco - alfresco-rm-enterprise-repo - ${project.version} - amp - - - ${project.build.directory}/amps - true - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - true - - - install-community-repo-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - - - - install-enterprise-repo-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - - - - install-community-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - install-enterprise-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - - - - - - run-alfresco - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - prepare-jacoco - - prepare-agent - - - - - - org.alfresco.* - - - - - maven-antrun-plugin - - - start-alfresco - process-test-classes - - run - - - - Starting Alfresco... - - - - - - - - - - stop-alfresco - post-integration-test - - run - - - - Stopping Alfresco... - - - - - - - - - - - - - + + + ru.yandex.qatools.properties + properties-loader + 1.5 + test + + + com.github.tomakehurst + wiremock + 1.56 + + + org.mockito + mockito-all + test + + + + + + install-alfresco + + + + maven-antrun-plugin + + + fetch-installer + generate-test-resources + + run + + + + Recreating database... + drop database if exists alfresco; create database alfresco + Downloading Alfresco installer... + + + + Installing Alfresco... + + + + + + + + + + org.apache.ant + ant-jsch + 1.8.2 + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + + + maven-dependency-plugin + + + fetch-amps + process-test-resources + + copy + + + + + org.alfresco + alfresco-rm-enterprise-share + ${project.version} + amp + + + org.alfresco + alfresco-rm-enterprise-repo + ${project.version} + amp + + + ${project.build.directory}/amps + true + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + + install-enterprise-repo-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + + + + install-enterprise-share-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + + + + + + run-alfresco + + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + prepare-jacoco + + prepare-agent + + + + + + org.alfresco.* + + + + + maven-antrun-plugin + + + start-alfresco + process-test-classes + + run + + + + Starting Alfresco... + + + + + + + + + + stop-alfresco + post-integration-test + + run + + + + Stopping Alfresco... + + + + + + + + + + + + + diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index b6a1527ee5..f564d1fa8d 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -1,618 +1,615 @@ - - - 4.0.0 - alfresco-rm-community-repo - Alfresco Records Management Community Repo - Alfresco Record Management Core Repository Extension - amp - - - org.alfresco - alfresco-rm-community + + + 4.0.0 + alfresco-rm-community-repo + Alfresco Records Management Community Repo + Alfresco Record Management Community Repository Extension + amp + + + org.alfresco + alfresco-rm-community 2.5-SNAPSHOT - - - - ${basedir}/target/alf_test_data - org.hibernate.dialect.H2Dialect - alfresco - alfresco - alfresco - localhost - alfresco - 9.1-901.jdbc4 - 5.1.31 - alfresco-rm-community-repo - true - ${project.build.directory}/solr/home - - - - source/java - test/java - - - config - ${app.filtering.enabled} - - - - - unit-test/resources - - - test/resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - - add-source - - - - source/compatibility - - - - - add-test-source - - add-test-source - - - - unit-test/java - - - - - - - maven-antrun-plugin - - - prepare-package - - run - - - - - - - - - - - - - - org.codehaus.mojo - properties-maven-plugin - - - initialize - - read-project-properties - - - - ${basedir}/src/main/resources/local.properties - - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/AllUnitTestSuite.class - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-tests - - integration-test - verify - - - ${skip.integrationtests} - - **/AllTestSuite.class - - - ${project.build.directory}/${project.build.finalName}/config - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-alfresco - prepare-package - - unpack - - - ${app.amp.client.war.folder} - - - ${alfresco.groupId} - ${app.amp.client.war.artifactId} - war - ${alfresco.version} - - - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - - - attach-rm-jar - - amp - - - true - true - true - - - - amps-to-war-overlay - package - - install - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - **/alfresco-global.properties - - - - - - - org.codehaus.mojo - license-maven-plugin - - alfresco_community - - source/java - unit-test/java - source/compatibility - config - test/java - test/resources - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - - - - - - org.codehaus.mojo - properties-maven-plugin - [1.0-alpha-2,) - - read-project-properties - - - - - - - - - org.codehaus.mojo - license-maven-plugin - [1.8,) - - update-file-header - - - - - - - - - - - - - - - - - ${alfresco.groupId} - alfresco-remote-api - - - io.takari.junit - takari-cpsuite - 1.2.7 - test - - - junit - junit - test - - - org.springframework.extensions.surf - spring-webscripts - tests - test - - - org.mockito - mockito-all - test - - - org.springframework - spring-test - 2.5 - test - - - ${alfresco.groupId} - alfresco-repository - ${alfresco.version} - tests - test - - - ${alfresco.groupId} - alfresco-remote-api - ${alfresco.version} - tests - test - - - postgresql - postgresql - ${alfresco.postgres.version} - test - - - mysql - mysql-connector-java - test - - - ${alfresco.groupId} - alfresco-repository - ${alfresco.version} - h2scripts - - - * - * - - - test - + + + + ${basedir}/target/alf_test_data + org.hibernate.dialect.H2Dialect + alfresco + alfresco + alfresco + localhost + alfresco + 9.1-901.jdbc4 + 5.1.31 + alfresco-rm-community-repo + true + ${project.build.directory}/solr/home + + + + source/java + test/java + + + config + ${app.filtering.enabled} + + + + + unit-test/resources + + + test/resources + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + + add-source + + + + source/compatibility + + + + + add-test-source + + add-test-source + + + + unit-test/java + + + + + + + maven-antrun-plugin + + + prepare-package + + run + + + + + + + + + + + + + + org.codehaus.mojo + properties-maven-plugin + + + initialize + + read-project-properties + + + + ${basedir}/src/main/resources/local.properties + + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/AllUnitTestSuite.class + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-tests + + integration-test + verify + + + ${skip.integrationtests} + + **/AllTestSuite.class + + + ${project.build.directory}/${project.build.finalName}/config + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-alfresco + prepare-package + + unpack + + + ${app.amp.client.war.folder} + + + ${alfresco.groupId} + ${app.amp.client.war.artifactId} + war + ${alfresco.version} + + + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + + + attach-rm-jar + + amp + + + true + true + true + + + + amps-to-war-overlay + package + + install + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + **/alfresco-global.properties + + + + + org.codehaus.mojo + license-maven-plugin + + alfresco_community + + source/java + unit-test/java + source/compatibility + config + test/java + test/resources + + + + + + + + org.eclipse.m2e + lifecycle-mapping + + + + + + org.codehaus.mojo + properties-maven-plugin + [1.0-alpha-2,) + + read-project-properties + + + + + + + + + org.codehaus.mojo + license-maven-plugin + [1.8,) + + update-file-header + + + + + + + + + + + + + + + + + ${alfresco.groupId} + alfresco-remote-api + + + io.takari.junit + takari-cpsuite + 1.2.7 + test + + + junit + junit + test + + + org.springframework.extensions.surf + spring-webscripts + tests + test + + + org.mockito + mockito-all + test + + + org.springframework + spring-test + 2.5 + test + + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + tests + test + + + ${alfresco.groupId} + alfresco-remote-api + ${alfresco.version} + tests + test + + + postgresql + postgresql + ${alfresco.postgres.version} + test + + + mysql + mysql-connector-java + test + + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + h2scripts + + + * + * + + + test + org.reflections reflections test - - - - - use-mysql - - ${my.db.name} - ${my.db.port} - org.hibernate.dialect.MySQLInnoDBDialect - - jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} - jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} - org.gjt.mm.mysql.Driver - - - - use-postgres - - ${my.db.name} - ${my.db.port} - org.hibernate.dialect.PostgreSQLDialect - - jdbc:postgresql:template1 - jdbc:postgresql:${alfresco.db.name} - org.postgresql.Driver - - - - start-repo - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-alfresco - prepare-package - - unpack - - - ${app.amp.client.war.folder} - - - ${alfresco.groupId} - ${alfresco.repo.artifactId} - war - ${alfresco.version} - - - - - - unpack-alfresco-config - - unpack - - generate-resources - - ${alfresco.solr.home} - - - alfresco-solr4 - ${alfresco.groupId} - config - ${alfresco.version} - zip - - - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - - - amps-to-war-overlay - package - - install - - - - - false - - - - org.codehaus.mojo - build-helper-maven-plugin - - - regex-property - generate-resources - - regex-property - - - solrHomePath - ${alfresco.solr.home} - \\ - \\\\ - false - - - - - - com.google.code.maven-replacer-plugin - replacer - - - setup-solr-config - generate-resources - - replace - - - - - false - - ${alfresco.solr.home}/context.xml - ${alfresco.solr.home}/archive-SpacesStore/conf/solrcore.properties - ${alfresco.solr.home}/workspace-SpacesStore/conf/solrcore.properties - ${app.amp.client.war.folder}/WEB-INF/web.xml - - - - @@ALFRESCO_SOLR4_DIR@@ - ${solrHomePath}/ - - - @@ALFRESCO_SOLR4_MODEL_DIR@@ - ${solrHomePath}/alfrescoModels/ - - - @@ALFRESCO_SOLR4_CONTENT_DIR@@ - ${solrHomePath}/data/content/ - - - @@ALFRESCO_SOLR4_DATA_DIR@@ - ${solrHomePath}/data/index/ - - - ]]> - - - - ]]> - ]]> - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - - run-embedded - - run - - integration-test - - false - true - true - - ${project.build.directory} - - false - ${project.basedir}/tomcat/context.xml - - - ${alfresco.groupId} - alfresco-solr4 - ${alfresco.version} - war - true - /solr4 - ${alfresco.solr.home}/context.xml - - - - - - - - postgresql - postgresql - ${alfresco.postgres.version} - - - mysql - mysql-connector-java - ${alfresco.mysql.version} - - - ${alfresco.groupId} - alfresco-repository - ${alfresco.version} - h2scripts - - - * - * - - - - - - - - - - - wipeDB - - - - org.codehaus.mojo - sql-maven-plugin - - true - ${alfresco.db.datasource.class} - ${alfresco.db.master.url} - ${alfresco.db.username} - ${alfresco.db.password} - - - - postgresql - postgresql - ${alfresco.postgres.version} - - - mysql - mysql-connector-java - ${alfresco.mysql.version} - - - - - wipe-database - process-test-resources - - execute - - - drop database if exists alfresco - - - - create-database - process-test-resources - - execute - - - create database alfresco - - - - - - - - + + + + + use-mysql + + ${my.db.name} + ${my.db.port} + org.hibernate.dialect.MySQLInnoDBDialect + + jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} + jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} + org.gjt.mm.mysql.Driver + + + + use-postgres + + ${my.db.name} + ${my.db.port} + org.hibernate.dialect.PostgreSQLDialect + + jdbc:postgresql:template1 + jdbc:postgresql:${alfresco.db.name} + org.postgresql.Driver + + + + start-repo + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-alfresco + prepare-package + + unpack + + + ${app.amp.client.war.folder} + + + ${alfresco.groupId} + ${alfresco.repo.artifactId} + war + ${alfresco.version} + + + + + + unpack-alfresco-config + + unpack + + generate-resources + + ${alfresco.solr.home} + + + alfresco-solr4 + ${alfresco.groupId} + config + ${alfresco.version} + zip + + + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + + + amps-to-war-overlay + package + + install + + + + + false + + + + org.codehaus.mojo + build-helper-maven-plugin + + + regex-property + generate-resources + + regex-property + + + solrHomePath + ${alfresco.solr.home} + \\ + \\\\ + false + + + + + + com.google.code.maven-replacer-plugin + replacer + + + setup-solr-config + generate-resources + + replace + + + + + false + + ${alfresco.solr.home}/context.xml + ${alfresco.solr.home}/archive-SpacesStore/conf/solrcore.properties + ${alfresco.solr.home}/workspace-SpacesStore/conf/solrcore.properties + ${app.amp.client.war.folder}/WEB-INF/web.xml + + + + @@ALFRESCO_SOLR4_DIR@@ + ${solrHomePath}/ + + + @@ALFRESCO_SOLR4_MODEL_DIR@@ + ${solrHomePath}/alfrescoModels/ + + + @@ALFRESCO_SOLR4_CONTENT_DIR@@ + ${solrHomePath}/data/content/ + + + @@ALFRESCO_SOLR4_DATA_DIR@@ + ${solrHomePath}/data/index/ + + + ]]> + + + + ]]> + ]]> + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + + run-embedded + + run + + integration-test + + false + true + true + + ${project.build.directory} + + false + ${project.basedir}/tomcat/context.xml + + + ${alfresco.groupId} + alfresco-solr4 + ${alfresco.version} + war + true + /solr4 + ${alfresco.solr.home}/context.xml + + + + + + + + postgresql + postgresql + ${alfresco.postgres.version} + + + mysql + mysql-connector-java + ${alfresco.mysql.version} + + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + h2scripts + + + * + * + + + + + + + + + + + wipeDB + + + + org.codehaus.mojo + sql-maven-plugin + + true + ${alfresco.db.datasource.class} + ${alfresco.db.master.url} + ${alfresco.db.username} + ${alfresco.db.password} + + + + postgresql + postgresql + ${alfresco.postgres.version} + + + mysql + mysql-connector-java + ${alfresco.mysql.version} + + + + + wipe-database + process-test-resources + + execute + + + drop database if exists alfresco + + + + create-database + process-test-resources + + execute + + + create database alfresco + + + + + + + + \ No newline at end of file From 1d69a20a66cc8985c955fb65c6455dc2ad9c6563 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 1 Jul 2016 23:03:43 +0100 Subject: [PATCH 16/17] Fixed line endings --- rm-automation/pom.xml | 4 ++-- rm-community/rm-community-repo/pom.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 28a665b4ae..7021befcf7 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.5-SNAPSHOT + 2.5-SNAPSHOT @@ -155,7 +155,7 @@ ru.yandex.qatools.htmlelements htmlelements-all - 1.15 + 1.15 ru.yandex.qatools.properties diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index f564d1fa8d..86baad68c8 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-SNAPSHOT + 2.5-SNAPSHOT @@ -334,11 +334,11 @@ test - - org.reflections - reflections - test - + + org.reflections + reflections + test + From b73fa7d7aa3e9482512f44687600e7c33a4e4615 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 1 Jul 2016 23:07:32 +0100 Subject: [PATCH 17/17] Changed line ending to Unix --- rm-automation/pom.xml | 696 +++++++------- rm-community/rm-community-repo/pom.xml | 1228 ++++++++++++------------ 2 files changed, 962 insertions(+), 962 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 7021befcf7..f4305fe14c 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -1,348 +1,348 @@ - - - - 4.0.0 - alfresco-rm-automation - Alfresco Records Management Automation - - - org.alfresco - alfresco-rm - 2.5-SNAPSHOT - - - - 2.45.0 - 4.0.5.RELEASE - 1.8 - testng.xml - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source - - add-test-source - - - - src/unit-test/java - - - - - - - maven-surefire-plugin - - false - - ${project.build.testOutputDirectory}/${suiteXmlFile} - - ${skip.automationtests} - - - - maven-antrun-plugin - - - default-cli - - - Stopping Alfresco... - - - - - - - - - - org.codehaus.mojo - license-maven-plugin - - alfresco_enterprise - file:${project.parent.basedir}/license - ${project.parent.basedir}/license/description.ftl - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - license-maven-plugin - [1.8,) - - update-file-header - - - - - - - - - - - - - - - - - org.alfresco.test - dataprep - 1.8 - - - org.alfresco.test - alfresco-testng - 1.1 - - - org.alfresco - selenium-grid - 1.8 - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.testng - testng - 6.8.8 - - - ru.yandex.qatools.htmlelements - htmlelements-all - 1.15 - - - ru.yandex.qatools.properties - properties-loader - 1.5 - test - - - com.github.tomakehurst - wiremock - 1.56 - - - org.mockito - mockito-all - test - - - - - - install-alfresco - - - - maven-antrun-plugin - - - fetch-installer - generate-test-resources - - run - - - - Recreating database... - drop database if exists alfresco; create database alfresco - Downloading Alfresco installer... - - - - Installing Alfresco... - - - - - - - - - - org.apache.ant - ant-jsch - 1.8.2 - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - - maven-dependency-plugin - - - fetch-amps - process-test-resources - - copy - - - - - org.alfresco - alfresco-rm-enterprise-share - ${project.version} - amp - - - org.alfresco - alfresco-rm-enterprise-repo - ${project.version} - amp - - - ${project.build.directory}/amps - true - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - true - - - install-enterprise-repo-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - - - - install-enterprise-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - - - - - - run-alfresco - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - prepare-jacoco - - prepare-agent - - - - - - org.alfresco.* - - - - - maven-antrun-plugin - - - start-alfresco - process-test-classes - - run - - - - Starting Alfresco... - - - - - - - - - - stop-alfresco - post-integration-test - - run - - - - Stopping Alfresco... - - - - - - - - - - - - - + + + + 4.0.0 + alfresco-rm-automation + Alfresco Records Management Automation + + + org.alfresco + alfresco-rm + 2.5-SNAPSHOT + + + + 2.45.0 + 4.0.5.RELEASE + 1.8 + testng.xml + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + + add-test-source + + + + src/unit-test/java + + + + + + + maven-surefire-plugin + + false + + ${project.build.testOutputDirectory}/${suiteXmlFile} + + ${skip.automationtests} + + + + maven-antrun-plugin + + + default-cli + + + Stopping Alfresco... + + + + + + + + + + org.codehaus.mojo + license-maven-plugin + + alfresco_enterprise + file:${project.parent.basedir}/license + ${project.parent.basedir}/license/description.ftl + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + license-maven-plugin + [1.8,) + + update-file-header + + + + + + + + + + + + + + + + + org.alfresco.test + dataprep + 1.8 + + + org.alfresco.test + alfresco-testng + 1.1 + + + org.alfresco + selenium-grid + 1.8 + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + test + + + org.springframework + spring-test + ${spring.version} + test + + + org.testng + testng + 6.8.8 + + + ru.yandex.qatools.htmlelements + htmlelements-all + 1.15 + + + ru.yandex.qatools.properties + properties-loader + 1.5 + test + + + com.github.tomakehurst + wiremock + 1.56 + + + org.mockito + mockito-all + test + + + + + + install-alfresco + + + + maven-antrun-plugin + + + fetch-installer + generate-test-resources + + run + + + + Recreating database... + drop database if exists alfresco; create database alfresco + Downloading Alfresco installer... + + + + Installing Alfresco... + + + + + + + + + + org.apache.ant + ant-jsch + 1.8.2 + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + + + maven-dependency-plugin + + + fetch-amps + process-test-resources + + copy + + + + + org.alfresco + alfresco-rm-enterprise-share + ${project.version} + amp + + + org.alfresco + alfresco-rm-enterprise-repo + ${project.version} + amp + + + ${project.build.directory}/amps + true + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + + install-enterprise-repo-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + + + + install-enterprise-share-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + + + + + + run-alfresco + + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + prepare-jacoco + + prepare-agent + + + + + + org.alfresco.* + + + + + maven-antrun-plugin + + + start-alfresco + process-test-classes + + run + + + + Starting Alfresco... + + + + + + + + + + stop-alfresco + post-integration-test + + run + + + + Stopping Alfresco... + + + + + + + + + + + + + diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 86baad68c8..a4123f6651 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -1,615 +1,615 @@ - - - 4.0.0 - alfresco-rm-community-repo - Alfresco Records Management Community Repo - Alfresco Record Management Community Repository Extension - amp - - - org.alfresco - alfresco-rm-community - 2.5-SNAPSHOT - - - - ${basedir}/target/alf_test_data - org.hibernate.dialect.H2Dialect - alfresco - alfresco - alfresco - localhost - alfresco - 9.1-901.jdbc4 - 5.1.31 - alfresco-rm-community-repo - true - ${project.build.directory}/solr/home - - - - source/java - test/java - - - config - ${app.filtering.enabled} - - - - - unit-test/resources - - - test/resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - - add-source - - - - source/compatibility - - - - - add-test-source - - add-test-source - - - - unit-test/java - - - - - - - maven-antrun-plugin - - - prepare-package - - run - - - - - - - - - - - - - - org.codehaus.mojo - properties-maven-plugin - - - initialize - - read-project-properties - - - - ${basedir}/src/main/resources/local.properties - - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/AllUnitTestSuite.class - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - integration-tests - - integration-test - verify - - - ${skip.integrationtests} - - **/AllTestSuite.class - - - ${project.build.directory}/${project.build.finalName}/config - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-alfresco - prepare-package - - unpack - - - ${app.amp.client.war.folder} - - - ${alfresco.groupId} - ${app.amp.client.war.artifactId} - war - ${alfresco.version} - - - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - - - attach-rm-jar - - amp - - - true - true - true - - - - amps-to-war-overlay - package - - install - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - **/alfresco-global.properties - - - - - org.codehaus.mojo - license-maven-plugin - - alfresco_community - - source/java - unit-test/java - source/compatibility - config - test/java - test/resources - - - - - - - - org.eclipse.m2e - lifecycle-mapping - - - - - - org.codehaus.mojo - properties-maven-plugin - [1.0-alpha-2,) - - read-project-properties - - - - - - - - - org.codehaus.mojo - license-maven-plugin - [1.8,) - - update-file-header - - - - - - - - - - - - - - - - - ${alfresco.groupId} - alfresco-remote-api - - - io.takari.junit - takari-cpsuite - 1.2.7 - test - - - junit - junit - test - - - org.springframework.extensions.surf - spring-webscripts - tests - test - - - org.mockito - mockito-all - test - - - org.springframework - spring-test - 2.5 - test - - - ${alfresco.groupId} - alfresco-repository - ${alfresco.version} - tests - test - - - ${alfresco.groupId} - alfresco-remote-api - ${alfresco.version} - tests - test - - - postgresql - postgresql - ${alfresco.postgres.version} - test - - - mysql - mysql-connector-java - test - - - ${alfresco.groupId} - alfresco-repository - ${alfresco.version} - h2scripts - - - * - * - - - test - - - org.reflections - reflections - test - - - - - - use-mysql - - ${my.db.name} - ${my.db.port} - org.hibernate.dialect.MySQLInnoDBDialect - - jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} - jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} - org.gjt.mm.mysql.Driver - - - - use-postgres - - ${my.db.name} - ${my.db.port} - org.hibernate.dialect.PostgreSQLDialect - - jdbc:postgresql:template1 - jdbc:postgresql:${alfresco.db.name} - org.postgresql.Driver - - - - start-repo - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-alfresco - prepare-package - - unpack - - - ${app.amp.client.war.folder} - - - ${alfresco.groupId} - ${alfresco.repo.artifactId} - war - ${alfresco.version} - - - - - - unpack-alfresco-config - - unpack - - generate-resources - - ${alfresco.solr.home} - - - alfresco-solr4 - ${alfresco.groupId} - config - ${alfresco.version} - zip - - - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - - - amps-to-war-overlay - package - - install - - - - - false - - - - org.codehaus.mojo - build-helper-maven-plugin - - - regex-property - generate-resources - - regex-property - - - solrHomePath - ${alfresco.solr.home} - \\ - \\\\ - false - - - - - - com.google.code.maven-replacer-plugin - replacer - - - setup-solr-config - generate-resources - - replace - - - - - false - - ${alfresco.solr.home}/context.xml - ${alfresco.solr.home}/archive-SpacesStore/conf/solrcore.properties - ${alfresco.solr.home}/workspace-SpacesStore/conf/solrcore.properties - ${app.amp.client.war.folder}/WEB-INF/web.xml - - - - @@ALFRESCO_SOLR4_DIR@@ - ${solrHomePath}/ - - - @@ALFRESCO_SOLR4_MODEL_DIR@@ - ${solrHomePath}/alfrescoModels/ - - - @@ALFRESCO_SOLR4_CONTENT_DIR@@ - ${solrHomePath}/data/content/ - - - @@ALFRESCO_SOLR4_DATA_DIR@@ - ${solrHomePath}/data/index/ - - - ]]> - - - - ]]> - ]]> - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - - run-embedded - - run - - integration-test - - false - true - true - - ${project.build.directory} - - false - ${project.basedir}/tomcat/context.xml - - - ${alfresco.groupId} - alfresco-solr4 - ${alfresco.version} - war - true - /solr4 - ${alfresco.solr.home}/context.xml - - - - - - - - postgresql - postgresql - ${alfresco.postgres.version} - - - mysql - mysql-connector-java - ${alfresco.mysql.version} - - - ${alfresco.groupId} - alfresco-repository - ${alfresco.version} - h2scripts - - - * - * - - - - - - - - - - - wipeDB - - - - org.codehaus.mojo - sql-maven-plugin - - true - ${alfresco.db.datasource.class} - ${alfresco.db.master.url} - ${alfresco.db.username} - ${alfresco.db.password} - - - - postgresql - postgresql - ${alfresco.postgres.version} - - - mysql - mysql-connector-java - ${alfresco.mysql.version} - - - - - wipe-database - process-test-resources - - execute - - - drop database if exists alfresco - - - - create-database - process-test-resources - - execute - - - create database alfresco - - - - - - - - + + + 4.0.0 + alfresco-rm-community-repo + Alfresco Records Management Community Repo + Alfresco Record Management Community Repository Extension + amp + + + org.alfresco + alfresco-rm-community + 2.5-SNAPSHOT + + + + ${basedir}/target/alf_test_data + org.hibernate.dialect.H2Dialect + alfresco + alfresco + alfresco + localhost + alfresco + 9.1-901.jdbc4 + 5.1.31 + alfresco-rm-community-repo + true + ${project.build.directory}/solr/home + + + + source/java + test/java + + + config + ${app.filtering.enabled} + + + + + unit-test/resources + + + test/resources + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + + add-source + + + + source/compatibility + + + + + add-test-source + + add-test-source + + + + unit-test/java + + + + + + + maven-antrun-plugin + + + prepare-package + + run + + + + + + + + + + + + + + org.codehaus.mojo + properties-maven-plugin + + + initialize + + read-project-properties + + + + ${basedir}/src/main/resources/local.properties + + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/AllUnitTestSuite.class + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + integration-tests + + integration-test + verify + + + ${skip.integrationtests} + + **/AllTestSuite.class + + + ${project.build.directory}/${project.build.finalName}/config + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-alfresco + prepare-package + + unpack + + + ${app.amp.client.war.folder} + + + ${alfresco.groupId} + ${app.amp.client.war.artifactId} + war + ${alfresco.version} + + + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + + + attach-rm-jar + + amp + + + true + true + true + + + + amps-to-war-overlay + package + + install + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + **/alfresco-global.properties + + + + + org.codehaus.mojo + license-maven-plugin + + alfresco_community + + source/java + unit-test/java + source/compatibility + config + test/java + test/resources + + + + + + + + org.eclipse.m2e + lifecycle-mapping + + + + + + org.codehaus.mojo + properties-maven-plugin + [1.0-alpha-2,) + + read-project-properties + + + + + + + + + org.codehaus.mojo + license-maven-plugin + [1.8,) + + update-file-header + + + + + + + + + + + + + + + + + ${alfresco.groupId} + alfresco-remote-api + + + io.takari.junit + takari-cpsuite + 1.2.7 + test + + + junit + junit + test + + + org.springframework.extensions.surf + spring-webscripts + tests + test + + + org.mockito + mockito-all + test + + + org.springframework + spring-test + 2.5 + test + + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + tests + test + + + ${alfresco.groupId} + alfresco-remote-api + ${alfresco.version} + tests + test + + + postgresql + postgresql + ${alfresco.postgres.version} + test + + + mysql + mysql-connector-java + test + + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + h2scripts + + + * + * + + + test + + + org.reflections + reflections + test + + + + + + use-mysql + + ${my.db.name} + ${my.db.port} + org.hibernate.dialect.MySQLInnoDBDialect + + jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} + jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name} + org.gjt.mm.mysql.Driver + + + + use-postgres + + ${my.db.name} + ${my.db.port} + org.hibernate.dialect.PostgreSQLDialect + + jdbc:postgresql:template1 + jdbc:postgresql:${alfresco.db.name} + org.postgresql.Driver + + + + start-repo + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-alfresco + prepare-package + + unpack + + + ${app.amp.client.war.folder} + + + ${alfresco.groupId} + ${alfresco.repo.artifactId} + war + ${alfresco.version} + + + + + + unpack-alfresco-config + + unpack + + generate-resources + + ${alfresco.solr.home} + + + alfresco-solr4 + ${alfresco.groupId} + config + ${alfresco.version} + zip + + + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + + + amps-to-war-overlay + package + + install + + + + + false + + + + org.codehaus.mojo + build-helper-maven-plugin + + + regex-property + generate-resources + + regex-property + + + solrHomePath + ${alfresco.solr.home} + \\ + \\\\ + false + + + + + + com.google.code.maven-replacer-plugin + replacer + + + setup-solr-config + generate-resources + + replace + + + + + false + + ${alfresco.solr.home}/context.xml + ${alfresco.solr.home}/archive-SpacesStore/conf/solrcore.properties + ${alfresco.solr.home}/workspace-SpacesStore/conf/solrcore.properties + ${app.amp.client.war.folder}/WEB-INF/web.xml + + + + @@ALFRESCO_SOLR4_DIR@@ + ${solrHomePath}/ + + + @@ALFRESCO_SOLR4_MODEL_DIR@@ + ${solrHomePath}/alfrescoModels/ + + + @@ALFRESCO_SOLR4_CONTENT_DIR@@ + ${solrHomePath}/data/content/ + + + @@ALFRESCO_SOLR4_DATA_DIR@@ + ${solrHomePath}/data/index/ + + + ]]> + + + + ]]> + ]]> + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + + run-embedded + + run + + integration-test + + false + true + true + + ${project.build.directory} + + false + ${project.basedir}/tomcat/context.xml + + + ${alfresco.groupId} + alfresco-solr4 + ${alfresco.version} + war + true + /solr4 + ${alfresco.solr.home}/context.xml + + + + + + + + postgresql + postgresql + ${alfresco.postgres.version} + + + mysql + mysql-connector-java + ${alfresco.mysql.version} + + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + h2scripts + + + * + * + + + + + + + + + + + wipeDB + + + + org.codehaus.mojo + sql-maven-plugin + + true + ${alfresco.db.datasource.class} + ${alfresco.db.master.url} + ${alfresco.db.username} + ${alfresco.db.password} + + + + postgresql + postgresql + ${alfresco.postgres.version} + + + mysql + mysql-connector-java + ${alfresco.mysql.version} + + + + + wipe-database + process-test-resources + + execute + + + drop database if exists alfresco + + + + create-database + process-test-resources + + execute + + + create database alfresco + + + + + + + + \ No newline at end of file