inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'feature/RM-7026_Add_HoldCreated_ToAudit'

Browse Source 
# Conflicts:
#   rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServicePolicies.java
#   rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/CreateHoldTest.java
#   rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java
This commit is contained in:
Sara Aspery
2019-11-04 07:22:27 +00:00
parent 1141668d43 81a73140b0
commit 31b81d2024
7 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -560,7 +560,7 @@
<jackson.version>2.9.9</jackson.version> <jackson.version>2.9.9</jackson.version>
<jackson-databind.version>2.9.9.3</jackson-databind.version> <jackson-databind.version>2.9.9.3</jackson-databind.version>
<fabric8.docker.version>0.25.0</fabric8.docker.version> <fabric8.docker.version>0.31.0</fabric8.docker.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<postgresql.version>42.2.6</postgresql.version> <postgresql.version>42.2.6</postgresql.version>
<postgresql.port>5432</postgresql.port> <postgresql.port>5432</postgresql.port>

3
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service.properties
View File

@@ -1,6 +1,5 @@
rm.hold.not-hold={0} is not a hold. rm.hold.not-hold={0} is not a hold.
rm.hold.add-to-hold-invalid-type={0} isn't a record, a record folder or active content. Only records, record \ rm.hold.add-to-hold-invalid-type={0} isn't a record, a record folder or content. Only records, record folders or content can be added to a hold.
folders or active content can be added to a hold.
rm.hold.add-to-hold-archived-node=Archived content can't be added to a hold. rm.hold.add-to-hold-archived-node=Archived content can't be added to a hold.
rm.hold.add-to-hold-locked-node=Locked content can't be added to a hold. rm.hold.add-to-hold-locked-node=Locked content can't be added to a hold.
rm.hold.delete-frozen-node=Frozen content can't be deleted. rm.hold.delete-frozen-node=Frozen content can't be deleted.

1
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
View File

@@ -630,7 +630,6 @@
<!-- Abstract parent bean for many POST and PUT Hold beans --> <!-- Abstract parent bean for many POST and PUT Hold beans -->
<bean id="rmBaseHold" parent="webscript" abstract="true"> <bean id="rmBaseHold" parent="webscript" abstract="true">
<property name="holdService" ref="HoldService" /> <property name="holdService" ref="HoldService" />
<property name="recordService" ref="RecordService" />
<property name="recordFolderService" ref="RecordFolderService" /> <property name="recordFolderService" ref="RecordFolderService" />
<property name="nodeService" ref="NodeService" /> <property name="nodeService" ref="NodeService" />
<property name="nodeTypeUtility" ref="nodeTypeUtility" /> <property name="nodeTypeUtility" ref="nodeTypeUtility" />

10
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServicePolicies.java
View File

@@ -43,7 +43,7 @@ public interface HoldServicePolicies
{ {
interface BeforeCreateHoldPolicy extends ClassPolicy interface BeforeCreateHoldPolicy extends ClassPolicy
{ {
QName BEFORE_CREATE_HOLD = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeCreateHold"); public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeCreateHold");
/** /**
* Called before a hold is created. * Called before a hold is created.
* *
@@ -55,7 +55,7 @@ public interface HoldServicePolicies
interface OnCreateHoldPolicy extends ClassPolicy interface OnCreateHoldPolicy extends ClassPolicy
{ {
QName ON_CREATE_HOLD = QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateHold"); public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateHold");
/** /**
* Called when a hold is created. * Called when a hold is created.
* *
@@ -66,9 +66,9 @@ public interface HoldServicePolicies
interface BeforeDeleteHoldPolicy extends ClassPolicy interface BeforeDeleteHoldPolicy extends ClassPolicy
{ {
QName BEFORE_DELETE_HOLD = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeDeleteHold"); public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeDeleteHold");
/** /**
* Called before a hold is created. * Called before a hold is deleted.
* *
* @param hold node reference * @param hold node reference
*/ */
@@ -77,7 +77,7 @@ public interface HoldServicePolicies
interface OnDeleteHoldPolicy extends ClassPolicy interface OnDeleteHoldPolicy extends ClassPolicy
{ {
QName ON_DELETE_HOLD = QName.createQName(NamespaceService.ALFRESCO_URI, "onDeleteHold"); public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onDeleteHold");
/** /**
* Called when a hold is deleted. * Called when a hold is deleted.

12
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/hold/BaseHold.java
View File

@@ -35,7 +35,6 @@ import java.util.Map;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldService; import org.alfresco.module.org_alfresco_module_rm.hold.HoldService;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService; import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService;
import org.alfresco.module.org_alfresco_module_rm.util.NodeTypeUtility; import org.alfresco.module.org_alfresco_module_rm.util.NodeTypeUtility;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -61,9 +60,6 @@ public abstract class BaseHold extends DeclarativeWebScript
/** Hold Service */ /** Hold Service */
private HoldService holdService; private HoldService holdService;
/** record service */
private RecordService recordService;
/** record folder service */ /** record folder service */
private RecordFolderService recordFolderService; private RecordFolderService recordFolderService;
@@ -91,14 +87,6 @@ public abstract class BaseHold extends DeclarativeWebScript
this.recordFolderService = recordFolderService; this.recordFolderService = recordFolderService;
} }
/**
* @param recordService record service
*/
public void setRecordService(RecordService recordService)
{
this.recordService = recordService;
}
/** /**
* @param nodeService node service * @param nodeService node service
*/ */

4
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/CreateHoldTest.java
View File

@@ -155,11 +155,11 @@ public class CreateHoldTest extends BaseRMTestCase implements BeforeCreateHoldPo
public void given() public void given()
{ {
beforeCreateHoldBehaviour = policyComponent.bindClassBehaviour(HoldServicePolicies.BeforeCreateHoldPolicy.BEFORE_CREATE_HOLD, beforeCreateHoldBehaviour = policyComponent.bindClassBehaviour(BeforeCreateHoldPolicy.QNAME,
RecordsManagementModel.TYPE_HOLD_CONTAINER, RecordsManagementModel.TYPE_HOLD_CONTAINER,
new JavaBehaviour(CreateHoldTest.this, "beforeCreateHold", NotificationFrequency.EVERY_EVENT)); new JavaBehaviour(CreateHoldTest.this, "beforeCreateHold", NotificationFrequency.EVERY_EVENT));
onCreateHoldBehaviour = policyComponent.bindClassBehaviour(HoldServicePolicies.OnCreateHoldPolicy.ON_CREATE_HOLD, onCreateHoldBehaviour = policyComponent.bindClassBehaviour(OnCreateHoldPolicy.QNAME,
RecordsManagementModel.TYPE_HOLD, RecordsManagementModel.TYPE_HOLD,
new JavaBehaviour(CreateHoldTest.this, "onCreateHold", NotificationFrequency.EVERY_EVENT)); new JavaBehaviour(CreateHoldTest.this, "onCreateHold", NotificationFrequency.EVERY_EVENT));

4
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java
View File

@@ -257,11 +257,11 @@ public class DeleteHoldTest extends BaseRMTestCase implements BeforeDeleteHoldPo
public void given() public void given()
{ {
beforeDeleteHoldBehaviour = policyComponent.bindClassBehaviour(BeforeDeleteHoldPolicy.BEFORE_DELETE_HOLD, beforeDeleteHoldBehaviour = policyComponent.bindClassBehaviour(BeforeDeleteHoldPolicy.QNAME,
RecordsManagementModel.TYPE_HOLD, RecordsManagementModel.TYPE_HOLD,
new JavaBehaviour(DeleteHoldTest.this, "beforeDeleteHold", NotificationFrequency.EVERY_EVENT)); new JavaBehaviour(DeleteHoldTest.this, "beforeDeleteHold", NotificationFrequency.EVERY_EVENT));
onDeleteHoldBehaviour = policyComponent.bindClassBehaviour(OnDeleteHoldPolicy.ON_DELETE_HOLD, RecordsManagementModel.TYPE_HOLD, onDeleteHoldBehaviour = policyComponent.bindClassBehaviour(OnDeleteHoldPolicy.QNAME, RecordsManagementModel.TYPE_HOLD,
new JavaBehaviour(DeleteHoldTest.this, "onDeleteHold", NotificationFrequency.EVERY_EVENT)); new JavaBehaviour(DeleteHoldTest.this, "onDeleteHold", NotificationFrequency.EVERY_EVENT));
// Create a hold // Create a hold