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

Some additional tests, plus review changes and Merge branch 'master' of https://git.alfresco.com/records-management/records-management into feature/RM-4339_RestTestsGuideTopicApi

Browse Source 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/rm-enterprise-public-rest-context.xml
This commit is contained in:
Oana Nechiforescu
2017-03-18 21:11:23 +02:00
parent 67234af7f6 ecc5ac590a
commit c3c6febd6e
11 changed files with 622 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
View File

@@ -60,9 +60,9 @@
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.TransferredCapabilityCondition"> class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.TransferredCapabilityCondition">
</bean> </bean>
<bean id="capabilityCondition.movable" <bean id="capabilityCondition.movableRecordFolder"
parent="capabilityCondition.base" parent="capabilityCondition.base"
class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.MovableCapabilityCondition"> class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.MovableRecordFolderCapabilityCondition">
</bean> </bean>
<bean id="capabilityCondition.destroyed" <bean id="capabilityCondition.destroyed"

7
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
View File

@@ -122,6 +122,11 @@
<property name="name" value="MoveRecordFolder"/> <property name="name" value="MoveRecordFolder"/>
<property name="private" value="true"/> <property name="private" value="true"/>
<property name="undetermined" value="true"/> <property name="undetermined" value="true"/>
<property name="kinds">
<list>
<value>RECORD_FOLDER</value>
</list>
</property>
<property name="capabilities"> <property name="capabilities">
<list> <list>
<ref bean="rmDeleteRecordFolderCapability"/> <ref bean="rmDeleteRecordFolderCapability"/>
@@ -129,7 +134,7 @@
</property> </property>
<property name="conditions"> <property name="conditions">
<map> <map>
<entry key="capabilityCondition.movable" value="true"/> <entry key="capabilityCondition.movableRecordFolder" value="true"/>
</map> </map>
</property> </property>
<property name="targetCapability" ref="rmCreateRecordFolderCapability"/> <property name="targetCapability" ref="rmCreateRecordFolderCapability"/>

38
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -388,10 +388,10 @@
<!-- File Plan Service --> <!-- File Plan Service -->
<bean id="rootContainerCache" class="org.alfresco.repo.cache.DefaultSimpleCache" /> <bean id="rootContainerCache" class="org.alfresco.repo.cache.DefaultSimpleCache" />
<bean id="filePlanService" <bean id="filePlanService"
parent="baseService" parent="baseService"
class="org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanServiceImpl"> class="org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanServiceImpl">
<property name="rootContainerCache" ref="rootContainerCache" /> <property name="rootContainerCache" ref="rootContainerCache" />
</bean> </bean>
@@ -1090,8 +1090,8 @@
</util:list> </util:list>
<bean id="recordMetadataAspectBootstrap" class="org.alfresco.module.org_alfresco_module_rm.record.RecordMetadataBootstrap" init-method="init" abstract="true"> <bean id="recordMetadataAspectBootstrap" class="org.alfresco.module.org_alfresco_module_rm.record.RecordMetadataBootstrap" init-method="init" abstract="true">
<property name="recordService" ref="recordService"/> <property name="recordService" ref="recordService"/>
<property name="namespaceService" ref="namespaceService"/> <property name="namespaceService" ref="namespaceService"/>
</bean> </bean>
<bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -1552,20 +1552,20 @@
<property name="objectDefinitionSource"> <property name="objectDefinitionSource">
<value> <value>
<![CDATA[ <![CDATA[
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.isHold=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.hold.HoldService.isHold=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHolds=RM.Read.0,AFTER_RM.FilterNode org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHolds=RM.Read.0,AFTER_RM.FilterNode
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHold=RM.Read.0,AFTER_RM.FilterNode org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHold=RM.Read.0,AFTER_RM.FilterNode
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.heldBy=RM.Read.0,AFTER_RM.FilterNode org.alfresco.module.org_alfresco_module_rm.hold.HoldService.heldBy=RM.Read.0,AFTER_RM.FilterNode
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHeld=RM.Read.0,AFTER_RM.FilterNode org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHeld=RM.Read.0,AFTER_RM.FilterNode
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.createHold=RM_CAP.0.rma:filePlanComponent.CreateHold org.alfresco.module.org_alfresco_module_rm.hold.HoldService.createHold=RM_CAP.0.rma:filePlanComponent.CreateHold
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHoldReason=RM.Read.0 org.alfresco.module.org_alfresco_module_rm.hold.HoldService.getHoldReason=RM.Read.0
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.setHoldReason=RM_CAP.0.rma:filePlanComponent.EditHold org.alfresco.module.org_alfresco_module_rm.hold.HoldService.setHoldReason=RM_CAP.0.rma:filePlanComponent.EditHold
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.deleteHold=RM_CAP.0.rma:filePlanComponent.DeleteHold org.alfresco.module.org_alfresco_module_rm.hold.HoldService.deleteHold=RM_CAP.0.rma:filePlanComponent.DeleteHold
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.addToHold=RM_CAP.0.rma:filePlanComponent.AddToHold org.alfresco.module.org_alfresco_module_rm.hold.HoldService.addToHold=RM_CAP.0.rma:filePlanComponent.AddToHold
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.addToHolds=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.hold.HoldService.addToHolds=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.removeFromHold=RM_CAP.0.rma:filePlanComponent.RemoveFromHold org.alfresco.module.org_alfresco_module_rm.hold.HoldService.removeFromHold=RM_CAP.0.rma:filePlanComponent.RemoveFromHold
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.removeFromHolds=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.hold.HoldService.removeFromHolds=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.removeFromAllHolds=RM_ALLOW org.alfresco.module.org_alfresco_module_rm.hold.HoldService.removeFromAllHolds=RM_ALLOW
org.alfresco.module.org_alfresco_module_rm.hold.HoldService.*=RM_DENY org.alfresco.module.org_alfresco_module_rm.hold.HoldService.*=RM_DENY
]]> ]]>
</value> </value>

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableCapabilityCondition.java → rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableRecordFolderCapabilityCondition.java
View File

@@ -36,7 +36,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
* @since 2.4.1 * @since 2.4.1
* *
*/ */
public class MovableCapabilityCondition extends AbstractCapabilityCondition public class MovableRecordFolderCapabilityCondition extends AbstractCapabilityCondition
{ {
/** /**
@@ -47,6 +47,6 @@ public class MovableCapabilityCondition extends AbstractCapabilityCondition
{ {
if (nodeService.hasAspect(nodeRef, ASPECT_GHOSTED) && dispositionService.isDisposableItemCutoff(nodeRef)) if (nodeService.hasAspect(nodeRef, ASPECT_GHOSTED) && dispositionService.isDisposableItemCutoff(nodeRef))
return true; return true;
return !dispositionService.isDisposableItemCutoff(nodeRef); return !(dispositionService.isDisposableItemCutoff(nodeRef) || recordFolderService.isRecordFolderClosed(nodeRef));
} }
} }

320
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -27,6 +27,12 @@
package org.alfresco.module.org_alfresco_module_rm.record; package org.alfresco.module.org_alfresco_module_rm.record;
import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.FIRST_EVENT;
import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.TRANSACTION_COMMIT;
import static org.alfresco.repo.policy.annotation.BehaviourKind.ASSOCIATION;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -67,10 +73,9 @@ import org.alfresco.module.org_alfresco_module_rm.role.Role;
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService; import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionModel; import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionModel;
import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService; import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService;
import org.alfresco.repo.content.ContentServicePolicies;
import org.alfresco.repo.node.NodeServicePolicies; import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.policy.Behaviour.NotificationFrequency;
import org.alfresco.repo.policy.ClassPolicyDelegate; import org.alfresco.repo.policy.ClassPolicyDelegate;
import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent; import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.policy.annotation.Behaviour; import org.alfresco.repo.policy.annotation.Behaviour;
import org.alfresco.repo.policy.annotation.BehaviourBean; import org.alfresco.repo.policy.annotation.BehaviourBean;
@@ -82,16 +87,13 @@ import org.alfresco.repo.security.permissions.impl.ExtendedPermissionService;
import org.alfresco.service.cmr.dictionary.AspectDefinition; import org.alfresco.service.cmr.dictionary.AspectDefinition;
import org.alfresco.service.cmr.dictionary.ClassDefinition; import org.alfresco.service.cmr.dictionary.ClassDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.model.FileExistsException;
import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException; import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.rule.RuleService; import org.alfresco.service.cmr.rule.RuleService;
import org.alfresco.service.cmr.security.AccessPermission; import org.alfresco.service.cmr.security.AccessPermission;
@@ -126,9 +128,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
RecordsManagementModel, RecordsManagementModel,
RecordsManagementCustomModel, RecordsManagementCustomModel,
NodeServicePolicies.OnCreateChildAssociationPolicy, NodeServicePolicies.OnCreateChildAssociationPolicy,
NodeServicePolicies.OnAddAspectPolicy, NodeServicePolicies.OnUpdatePropertiesPolicy,
NodeServicePolicies.OnRemoveAspectPolicy, ContentServicePolicies.OnContentUpdatePolicy
NodeServicePolicies.OnUpdatePropertiesPolicy
{ {
/** Logger */ /** Logger */
private static final Logger LOGGER = LoggerFactory.getLogger(RecordServiceImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(RecordServiceImpl.class);
@@ -141,7 +142,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
/** transation data key */ /** transation data key */
private static final String KEY_IGNORE_ON_UPDATE = "ignoreOnUpdate"; private static final String KEY_IGNORE_ON_UPDATE = "ignoreOnUpdate";
private static final String KEY_PENDING_FILLING = "pendingFilling";
public static final String KEY_NEW_RECORDS = "newRecords"; public static final String KEY_NEW_RECORDS = "newRecords";
/** I18N */ /** I18N */
@@ -257,12 +257,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
private ClassPolicyDelegate<BeforeFileRecord> beforeFileRecord; private ClassPolicyDelegate<BeforeFileRecord> beforeFileRecord;
private ClassPolicyDelegate<OnFileRecord> onFileRecord; private ClassPolicyDelegate<OnFileRecord> onFileRecord;
/** Behaviours */
private JavaBehaviour onCreateChildAssociation = new JavaBehaviour(
this,
"onCreateChildAssociation",
NotificationFrequency.FIRST_EVENT);
/** /**
* @param identifierService identifier service * @param identifierService identifier service
*/ */
@@ -396,8 +390,8 @@ public class RecordServiceImpl extends BaseBehaviourBean
*/ */
public void setRecordsManagementContainerType(RecordsManagementContainerType recordsManagementContainerType) public void setRecordsManagementContainerType(RecordsManagementContainerType recordsManagementContainerType)
{ {
this.recordsManagementContainerType = recordsManagementContainerType; this.recordsManagementContainerType = recordsManagementContainerType;
} }
/** /**
* @param recordableVersionService recordable version service * @param recordableVersionService recordable version service
@@ -415,13 +409,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
// bind policies // bind policies
beforeFileRecord = policyComponent.registerClassPolicy(BeforeFileRecord.class); beforeFileRecord = policyComponent.registerClassPolicy(BeforeFileRecord.class);
onFileRecord = policyComponent.registerClassPolicy(OnFileRecord.class); onFileRecord = policyComponent.registerClassPolicy(OnFileRecord.class);
// bind behaviours
policyComponent.bindAssociationBehaviour(
NodeServicePolicies.OnCreateChildAssociationPolicy.QNAME,
TYPE_RECORD_FOLDER,
ContentModel.ASSOC_CONTAINS,
onCreateChildAssociation);
} }
/** /**
@@ -430,88 +417,10 @@ public class RecordServiceImpl extends BaseBehaviourBean
@Override @Override
@Behaviour @Behaviour
( (
kind = BehaviourKind.CLASS, kind = ASSOCIATION,
type = "sys:noContent" type = "rma:recordFolder",
notificationFrequency = FIRST_EVENT
) )
public void onRemoveAspect(NodeRef nodeRef, QName aspect)
{
if (nodeService.hasAspect(nodeRef, ASPECT_RECORD))
{
ContentData contentData = (ContentData) nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
// Only switch name back to the format of "name (identifierId)" if content size is non-zero, else leave it as the original name to avoid CIFS shuffling issues.
if (contentData != null && contentData.getSize() > 0)
{
switchNames(nodeRef);
}
}
else
{
// check whether filling is pending aspect removal
Set<NodeRef> pendingFilling = transactionalResourceHelper.getSet(KEY_PENDING_FILLING);
if (pendingFilling.contains(nodeRef))
{
file(nodeRef);
}
}
}
/**
* @see org.alfresco.repo.node.NodeServicePolicies.OnAddAspectPolicy#onAddAspect(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName)
*/
@Override
@Behaviour
(
kind = BehaviourKind.CLASS,
type = "sys:noContent"
)
public void onAddAspect(NodeRef nodeRef, QName aspect)
{
switchNames(nodeRef);
}
/**
* Helper method to switch the name of the record around. Used to support record creation via
* file protocols.
*
* @param nodeRef node reference (record)
*/
private void switchNames(NodeRef nodeRef)
{
try
{
if (nodeService.hasAspect(nodeRef, ASPECT_RECORD))
{
String origionalName = (String)nodeService.getProperty(nodeRef, PROP_ORIGIONAL_NAME);
if (origionalName != null)
{
String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
fileFolderService.rename(nodeRef, origionalName);
nodeService.setProperty(nodeRef, PROP_ORIGIONAL_NAME, name);
}
}
}
catch (FileExistsException e)
{
LOGGER.debug(e.getMessage());
}
catch (InvalidNodeRefException e)
{
LOGGER.debug(e.getMessage());
}
catch (FileNotFoundException e)
{
LOGGER.debug(e.getMessage());
}
}
/**
* Behaviour executed when a new item is added to a record folder.
*
* @see org.alfresco.repo.node.NodeServicePolicies.OnCreateChildAssociationPolicy#onCreateChildAssociation(org.alfresco.service.cmr.repository.ChildAssociationRef, boolean)
*/
@Override
public void onCreateChildAssociation(final ChildAssociationRef childAssocRef, final boolean bNew) public void onCreateChildAssociation(final ChildAssociationRef childAssocRef, final boolean bNew)
{ {
AuthenticationUtil.runAs(new RunAsWork<Void>() AuthenticationUtil.runAs(new RunAsWork<Void>()
@@ -519,7 +428,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
@Override @Override
public Void doWork() public Void doWork()
{ {
onCreateChildAssociation.disable();
try try
{ {
NodeRef nodeRef = childAssocRef.getChildRef(); NodeRef nodeRef = childAssocRef.getChildRef();
@@ -528,38 +436,29 @@ public class RecordServiceImpl extends BaseBehaviourBean
!nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) && !nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) &&
!nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY)) !nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY))
{ {
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT)) // store information about the 'new' record in the transaction
// @since 2.3
// @see https://issues.alfresco.com/jira/browse/RM-1956
if (bNew)
{ {
// we need to postpone filling until the NO_CONTENT aspect is removed Set<NodeRef> newRecords = transactionalResourceHelper.getSet(KEY_NEW_RECORDS);
Set<NodeRef> pendingFilling = transactionalResourceHelper.getSet(KEY_PENDING_FILLING); newRecords.add(nodeRef);
pendingFilling.add(nodeRef);
} }
else else
{ {
// store information about the 'new' record in the transaction // if we are linking a record
// @since 2.3 NodeRef parentNodeRef = childAssocRef.getParentRef();
// @see https://issues.alfresco.com/jira/browse/RM-1956 if (isRecord(nodeRef) && isRecordFolder(parentNodeRef))
if (bNew)
{ {
Set<NodeRef> newRecords = transactionalResourceHelper.getSet(KEY_NEW_RECORDS); // validate the link conditions
newRecords.add(nodeRef); validateLinkConditions(nodeRef, parentNodeRef);
} }
else
{
// if we are linking a record
NodeRef parentNodeRef = childAssocRef.getParentRef();
if (isRecord(nodeRef) && isRecordFolder(parentNodeRef))
{
// validate the link conditions
validateLinkConditions(nodeRef, parentNodeRef);
}
}
// create and file the content as a record
file(nodeRef);
// recalculate disposition schedule for the record when linking it
dispositionService.recalculateNextDispositionStep(nodeRef);
} }
// create and file the content as a record
file(nodeRef);
// recalculate disposition schedule for the record when linking it
dispositionService.recalculateNextDispositionStep(nodeRef);
} }
} }
catch (RecordLinkRuntimeException e) catch (RecordLinkRuntimeException e)
@@ -572,10 +471,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
// do nothing but log error // do nothing but log error
LOGGER.warn("Unable to file pending record.", e); LOGGER.warn("Unable to file pending record.", e);
} }
finally
{
onCreateChildAssociation.enable();
}
return null; return null;
} }
@@ -651,20 +546,20 @@ public class RecordServiceImpl extends BaseBehaviourBean
if (beforeValue instanceof Date && afterValue instanceof Date) if (beforeValue instanceof Date && afterValue instanceof Date)
{ {
// deal with date values, remove the seconds and milliseconds for the // deal with date values, remove the seconds and milliseconds for the
// comparison as they are removed from the submitted for data // comparison as they are removed from the submitted for data
Calendar beforeCal = Calendar.getInstance(); Calendar beforeCal = Calendar.getInstance();
beforeCal.setTime((Date)beforeValue); beforeCal.setTime((Date)beforeValue);
Calendar afterCal = Calendar.getInstance(); Calendar afterCal = Calendar.getInstance();
afterCal.setTime((Date)afterValue); afterCal.setTime((Date)afterValue);
beforeCal.set(Calendar.SECOND, 0); beforeCal.set(Calendar.SECOND, 0);
beforeCal.set(Calendar.MILLISECOND, 0); beforeCal.set(Calendar.MILLISECOND, 0);
afterCal.set(Calendar.SECOND, 0); afterCal.set(Calendar.SECOND, 0);
afterCal.set(Calendar.MILLISECOND, 0); afterCal.set(Calendar.MILLISECOND, 0);
propertyUnchanged = (beforeCal.compareTo(afterCal) == 0); propertyUnchanged = (beforeCal.compareTo(afterCal) == 0);
} }
else if ((afterValue instanceof Boolean) && (beforeValue == null) && (afterValue.equals(Boolean.FALSE))) else if ((afterValue instanceof Boolean) && (beforeValue == null) && (afterValue.equals(Boolean.FALSE)))
{ {
propertyUnchanged = true; propertyUnchanged = true;
} }
else else
{ {
@@ -891,12 +786,12 @@ public class RecordServiceImpl extends BaseBehaviourBean
behaviourFilter.disableBehaviour(); behaviourFilter.disableBehaviour();
try try
{ {
// move the document into the file plan // move the document into the file plan
nodeService.moveNode(nodeRef, newRecordContainer, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName()); nodeService.moveNode(nodeRef, newRecordContainer, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName());
} }
finally finally
{ {
behaviourFilter.enableBehaviour(); behaviourFilter.enableBehaviour();
} }
// save the information about the originating details // save the information about the originating details
@@ -908,6 +803,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
// make the document a record // make the document a record
makeRecord(nodeRef); makeRecord(nodeRef);
renameRecord(nodeRef);
if (latestVersionRecord != null) if (latestVersionRecord != null)
{ {
@@ -1093,13 +989,13 @@ public class RecordServiceImpl extends BaseBehaviourBean
recordsManagementContainerType.disable(); recordsManagementContainerType.disable();
try try
{ {
// create a copy of the original state and add it to the unfiled record container // create a copy of the original state and add it to the unfiled record container
FileInfo recordInfo = fileFolderService.copy(nodeRef, unfiledRecordFolder, null); FileInfo recordInfo = fileFolderService.copy(nodeRef, unfiledRecordFolder, null);
record = recordInfo.getNodeRef(); record = recordInfo.getNodeRef();
} }
finally finally
{ {
recordsManagementContainerType.enable(); recordsManagementContainerType.enable();
} }
// if versionable, then remove without destroying version history, // if versionable, then remove without destroying version history,
@@ -1116,6 +1012,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
// make record // make record
makeRecord(record); makeRecord(record);
renameRecord(record);
// remove added copy assocs // remove added copy assocs
List<AssociationRef> recordAssocs = nodeService.getTargetAssocs(record, ContentModel.ASSOC_ORIGINAL); List<AssociationRef> recordAssocs = nodeService.getTargetAssocs(record, ContentModel.ASSOC_ORIGINAL);
@@ -1240,20 +1137,21 @@ public class RecordServiceImpl extends BaseBehaviourBean
result = authenticationUtil.runAsSystem(new RunAsWork<NodeRef>() result = authenticationUtil.runAsSystem(new RunAsWork<NodeRef>()
{ {
public NodeRef doWork() throws Exception public NodeRef doWork() throws Exception
{ {
// Check if the "record" aspect has been applied already. // Check if the "record" aspect has been applied already.
// In case of filing a report the created node will be made // In case of filing a report the created node will be made
// a record within the "onCreateChildAssociation" method if // a record within the "onCreateChildAssociation" method if
// a destination for the report has been selected. // a destination for the report has been selected.
if (!nodeService.hasAspect(record, ASPECT_RECORD)) if (!nodeService.hasAspect(record, ASPECT_RECORD))
{ {
// make record // make record
makeRecord(record); makeRecord(record);
} renameRecord(record);
}
return record; return record;
} }
}); });
} }
@@ -1286,28 +1184,6 @@ public class RecordServiceImpl extends BaseBehaviourBean
// get the record name // get the record name
String name = (String)nodeService.getProperty(document, ContentModel.PROP_NAME); String name = (String)nodeService.getProperty(document, ContentModel.PROP_NAME);
// rename the record
int dotIndex = name.lastIndexOf('.');
String prefix = name;
String postfix = "";
if (dotIndex != -1)
{
prefix = name.substring(0, dotIndex);
postfix = name.substring(dotIndex);
}
String recordName = prefix + " (" + recordId + ")" + postfix;
behaviourFilter.disableBehaviour();
try
{
fileFolderService.rename(document, recordName);
}
finally
{
behaviourFilter.enableBehaviour();
}
LOGGER.debug("Rename {} to {}", name, recordName);
// add the record aspect // add the record aspect
Map<QName, Serializable> props = new HashMap<QName, Serializable>(2); Map<QName, Serializable> props = new HashMap<QName, Serializable>(2);
props.put(PROP_IDENTIFIER, recordId); props.put(PROP_IDENTIFIER, recordId);
@@ -1319,10 +1195,11 @@ public class RecordServiceImpl extends BaseBehaviourBean
// remove the owner // remove the owner
ownableService.setOwner(document, OwnableService.NO_OWNER); ownableService.setOwner(document, OwnableService.NO_OWNER);
}
catch (FileNotFoundException e) if (TYPE_NON_ELECTRONIC_DOCUMENT.equals(nodeService.getType(document)))
{ {
throw new AlfrescoRuntimeException("Unable to make record, because rename failed.", e); renameRecord(document);
}
} }
finally finally
{ {
@@ -1344,13 +1221,13 @@ public class RecordServiceImpl extends BaseBehaviourBean
if (isRecord(nodeRef)) if (isRecord(nodeRef))
{ {
result = AuthenticationUtil.runAsSystem(new RunAsWork<Boolean>() result = AuthenticationUtil.runAsSystem(new RunAsWork<Boolean>()
{ {
public Boolean doWork() throws Exception public Boolean doWork() throws Exception
{ {
return (null != nodeService.getProperty(nodeRef, PROP_DATE_FILED)); return (null != nodeService.getProperty(nodeRef, PROP_DATE_FILED));
} }
}); });
} }
return result; return result;
@@ -1875,4 +1752,49 @@ public class RecordServiceImpl extends BaseBehaviourBean
throw new RecordLinkRuntimeException("Can only unlink a record from a record folder."); throw new RecordLinkRuntimeException("Can only unlink a record from a record folder.");
} }
} }
/*
* @see org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy#onContentUpdate(org.alfresco.service.cmr.repository.NodeRef, boolean)
*/
@Override
@Behaviour
(
kind = BehaviourKind.CLASS,
type = "rma:record",
notificationFrequency = TRANSACTION_COMMIT
)
public void onContentUpdate(NodeRef nodeRef, boolean newContent)
{
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN))
{
renameRecord(nodeRef);
}
}
private void renameRecord(NodeRef nodeRef)
{
// get the record id
String recordId = (String) nodeService.getProperty(nodeRef, PROP_IDENTIFIER);
if (isNotBlank(recordId))
{
// get the record name
String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
// rename the record
int dotIndex = name.lastIndexOf('.');
String prefix = name;
String postfix = "";
if (dotIndex > 0)
{
prefix = name.substring(0, dotIndex);
postfix = name.substring(dotIndex);
}
String recordName = prefix + " (" + recordId + ")" + postfix;
nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, recordName);
LOGGER.debug("Rename " + name + " to " + recordName);
}
}
} }

5
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
View File

@@ -222,15 +222,14 @@ public class TransferServiceImpl extends ServiceBaseImpl
nodeRef, nodeRef,
ASSOC_TRANSFERRED, ASSOC_TRANSFERRED,
ASSOC_TRANSFERRED); ASSOC_TRANSFERRED);
// Set PDF indicator flag
setPDFIndicationFlag(transferNodeRef, nodeRef);
} }
finally finally
{ {
transferType.enable(); transferType.enable();
} }
// Set PDF indicator flag
setPDFIndicationFlag(transferNodeRef, nodeRef);
// Set the transferring indicator aspect // Set the transferring indicator aspect
nodeService.addAspect(nodeRef, ASPECT_TRANSFERRING, null); nodeService.addAspect(nodeRef, ASPECT_TRANSFERRING, null);
if (isRecordFolder(nodeRef)) if (isRecordFolder(nodeRef))

1
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java
View File

@@ -52,6 +52,7 @@ import org.junit.runner.RunWith;
"!.*RM2190Test", "!.*RM2190Test",
"!.*RM981SystemTest", "!.*RM981SystemTest",
"!.*RM3993Test", "!.*RM3993Test",
"!.*RM4163Test",
"!.*RecordsManagementEventServiceImplTest", "!.*RecordsManagementEventServiceImplTest",
"!.*RmRestApiTest", "!.*RmRestApiTest",
"!.*NotificationServiceHelperSystemTest", "!.*NotificationServiceHelperSystemTest",

207
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4163Test.java Normal file
View File

@@ -0,0 +1,207 @@
/*
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2017 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 <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.module.org_alfresco_module_rm.test.integration.issue;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.FileToAction;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.rule.Rule;
import org.alfresco.service.cmr.rule.RuleService;
import org.alfresco.service.cmr.rule.RuleType;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
/**
* System test for RM-4163
*
* @author Silviu Dinuta
* @since 2.4.1
*/
public class RM4163Test extends BaseRMTestCase
{
private RuleService ruleService;
private NodeRef ruleFolder;
private NodeRef nodeRefCategory1;
@Override
protected void initServices()
{
super.initServices();
ruleService = (RuleService) applicationContext.getBean("RuleService");
}
@Override
protected boolean isCollaborationSiteTest()
{
return true;
}
@Override
protected boolean isRecordTest()
{
return true;
}
public void testDeclareRecordsConcurently() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
// create the folder
ruleFolder = fileFolderService.create(documentLibrary, "mytestfolder", ContentModel.TYPE_FOLDER)
.getNodeRef();
// create record category
nodeRefCategory1 = filePlanService.createRecordCategory(filePlan, "category1");
//define declare as record rule and apply it to the created folder from documentLibrary
Action action = actionService.createAction(CreateRecordAction.NAME);
action.setParameterValue(CreateRecordAction.PARAM_FILE_PLAN, filePlan);
Rule rule = new Rule();
rule.setRuleType(RuleType.INBOUND);
rule.setTitle("declareAsRecordRule");
rule.setAction(action);
rule.setExecuteAsynchronously(true);
ruleService.saveRule(ruleFolder, rule);
//define filing rule and apply it to unfiled record container
Action fileAction = actionService.createAction(FileToAction.NAME);
fileAction.setParameterValue(FileToAction.PARAM_PATH,
"/category1/{node.cm:description}");
fileAction.setParameterValue(FileToAction.PARAM_CREATE_RECORD_PATH, true);
Rule fileRule = new Rule();
fileRule.setRuleType(RuleType.INBOUND);
fileRule.setTitle("filingRule");
fileRule.setAction(fileAction);
fileRule.setExecuteAsynchronously(true);
ruleService.saveRule(filePlanService.getUnfiledContainer(filePlan), fileRule);
return null;
}
@Override
public void test(Void result) throws Exception
{
assertFalse(ruleService.getRules(ruleFolder).isEmpty());
}
});
//create 4 documents in documentLibrary
List<NodeRef> documents = new ArrayList<NodeRef>(4);
documents.addAll(doTestInTransaction(new Test<List<NodeRef>>()
{
@Override
public List<NodeRef> run() throws Exception
{
List<NodeRef> documents = new ArrayList<NodeRef>(4);
NodeRef document = createFile(documentLibrary, "document1.txt", "desc1", ContentModel.TYPE_CONTENT);
documents.add(document);
document = createFile(documentLibrary, "document2.txt", "desc2", ContentModel.TYPE_CONTENT);
documents.add(document);
document = createFile(documentLibrary, "document3.txt", "desc1", ContentModel.TYPE_CONTENT);
documents.add(document);
document = createFile(documentLibrary, "document4.txt", "desc1", ContentModel.TYPE_CONTENT);
documents.add(document);
return documents;
}
}));
//move created documents in the folder that has Declare as Record rule
final Iterator<NodeRef> temp = documents.iterator();
doTestInTransaction(new Test<Void>()
{
@Override
public Void run() throws Exception
{
while (temp.hasNext())
{
NodeRef document = temp.next();
fileFolderService.move(document, ruleFolder, null);
}
return null;
}
});
//give enough time for filing all records
Thread.sleep(5000);
//check that target category has in created record folders 4 records
Integer numberOfRecords = AuthenticationUtil.runAsSystem(new RunAsWork<Integer>()
{
@Override
public Integer doWork() throws Exception
{
List<NodeRef> containedRecordFolders = filePlanService.getContainedRecordFolders(nodeRefCategory1);
int numberOfRecords = 0;
for(NodeRef recordFolder : containedRecordFolders)
{
numberOfRecords = numberOfRecords + fileFolderService.list(recordFolder).size();
}
return numberOfRecords;
}
});
assertEquals(4, numberOfRecords.intValue());
}
private NodeRef createFile(NodeRef parentNodeRef, String name, String descrption, QName typeQName)
{
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(11);
properties.put(ContentModel.PROP_NAME, (Serializable) name);
properties.put(ContentModel.PROP_DESCRIPTION, (Serializable) descrption);
QName assocQName = QName.createQName(
NamespaceService.CONTENT_MODEL_1_0_URI,
QName.createValidLocalName(name));
ChildAssociationRef assocRef = nodeService.createNode(
parentNodeRef,
ContentModel.ASSOC_CONTAINS,
assocQName,
typeQName,
properties);
NodeRef nodeRef = assocRef.getChildRef();
return nodeRef;
}
}

133
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM4804Test.java Normal file
View File

@@ -0,0 +1,133 @@
/*
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2017 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 <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.module.org_alfresco_module_rm.test.integration.issue;
import java.io.InputStream;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.TransferAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.TransferCompleteAction;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
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.repo.content.MimetypeMap;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.extensions.webscripts.GUID;
/**
* Integration test for RM-4804
*
* Completed records of type pdf can be transferred
*
* @author Ramona Popa
* @since 2.6
*/
public class RM4804Test extends BaseRMTestCase
{
/**
* Given a category with disposition schedule applied on folder with Cut Of and Transfer, a record folder and a file PDF document
* to folder, complete the record
* When execute disposition schedule steps
* Then the Transfer step is successfully finished
*/
@org.junit.Test
public void testTransferCompletedRecordOfTypePDF() throws Exception
{
doBehaviourDrivenTest(new BehaviourDrivenTest()
{
NodeRef recordCategory;
NodeRef recordFolder;
NodeRef record;
public void given()
{
// category is created
recordCategory = filePlanService.createRecordCategory(filePlan, GUID.generate());
// create a disposition schedule for category, applied on folder
Map<QName, Serializable> dsProps = new HashMap<QName, Serializable>(3);
dsProps.put(PROP_DISPOSITION_AUTHORITY, CommonRMTestUtils.DEFAULT_DISPOSITION_AUTHORITY);
dsProps.put(PROP_DISPOSITION_INSTRUCTIONS, GUID.generate());
dsProps.put(PROP_RECORD_LEVEL_DISPOSITION, false);
DispositionSchedule dispositionSchedule = dispositionService.createDispositionSchedule(recordCategory, dsProps);
// cutoff immediately
Map<QName, Serializable> dispositionActionCutOff = new HashMap<QName, Serializable>(3);
dispositionActionCutOff.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME);
dispositionActionCutOff.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate());
dispositionActionCutOff.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY);
dispositionService.addDispositionActionDefinition(dispositionSchedule, dispositionActionCutOff);
// transfer immediately
Map<QName, Serializable> dispositionActionTransfer = new HashMap<QName, Serializable>(4);
dispositionActionTransfer.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME);
dispositionActionTransfer.put(PROP_DISPOSITION_DESCRIPTION, GUID.generate());
dispositionActionTransfer.put(PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY);
dispositionActionTransfer.put(PROP_DISPOSITION_LOCATION, StringUtils.EMPTY);
dispositionService.addDispositionActionDefinition(dispositionSchedule, dispositionActionTransfer);
// add folder under category
recordFolder = recordFolderService.createRecordFolder(recordCategory, GUID.generate());
// add record of type PDF under folder
Map<QName, Serializable> props = new HashMap<QName, Serializable>(1);
props.put(ContentModel.PROP_TITLE, GUID.generate());
InputStream inputStream = IOUtils.toInputStream(GUID.generate());
record = utils.createRecord(recordFolder, GUID.generate(), props, MimetypeMap.MIMETYPE_PDF, inputStream);
// complete the record
utils.completeRecord(record);
}
public void when()
{
// cut off and transfer record
rmActionService.executeRecordsManagementAction(recordFolder, CutOffAction.NAME, null);
NodeRef transferFolder = (NodeRef) rmActionService.executeRecordsManagementAction(recordFolder, TransferAction.NAME)
.getValue();
rmActionService.executeRecordsManagementAction(transferFolder, TransferCompleteAction.NAME);
}
public void then()
{
// verify record is transferred
assertTrue(nodeService.hasAspect(record, ASPECT_TRANSFERRED));
}
});
}
}

40
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/MoveRecordFolderTest.java
View File

@@ -510,6 +510,46 @@ public class MoveRecordFolderTest extends BaseRMTestCase
} }
/**
* Given a closed folder
* When we evaluate the move capability on it
* The access is denied
*/
public void testMoveClosedFolder()
{
final NodeRef destination = doTestInTransaction(new Test<NodeRef>()
{
@Override
public NodeRef run()
{
// create a record category
return filePlanService.createRecordCategory(filePlan, GUID.generate());
}
});
final NodeRef testFolder = doTestInTransaction(new Test<NodeRef>()
{
@Override
public NodeRef run()
{
// create folder
NodeRef testFolder = recordFolderService.createRecordFolder(rmContainer, GUID.generate());
// close folder
recordFolderService.closeRecordFolder(testFolder);
return testFolder;
}
@Override
public void test(NodeRef testFolder) throws Exception
{
Capability moveCapability = capabilityService.getCapability("MoveRecordFolder");
assertEquals(AccessDecisionVoter.ACCESS_DENIED, moveCapability.evaluate(testFolder, destination));
}
});
}
private NodeRef createRecordCategory(boolean recordLevel) private NodeRef createRecordCategory(boolean recordLevel)
{ {
NodeRef rc = filePlanService.createRecordCategory(filePlan, GUID.generate()); NodeRef rc = filePlanService.createRecordCategory(filePlan, GUID.generate());