assocs = nodeService.getChildAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
- for (ChildAssociationRef assoc : assocs)
- {
- NodeRef child = assoc.getChildRef();
- if (isFilePlanContainer(child) ||
- isRecordFolder(child) ||
- isRecord(child)||
- isHold(child) ||
- instanceOf(child, TYPE_TRANSFER))
- {
- deletePermission(child, authority, permission);
- }
- }
+ LOGGER.warn("Deleting permissions for this node is not supported. (nodeRef=" + nodeRef + ", authority=" + authority + ", permission=" + permission + ")");
}
}
@@ -590,4 +484,9 @@ public class FilePlanPermissionServiceImpl extends ServiceBaseImpl
}
});
}
+
+ private boolean canPerformPermissionAction(NodeRef nodeRef)
+ {
+ return isFilePlanContainer(nodeRef) || isRecordFolder(nodeRef) || isRecord(nodeRef);
+ }
}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/AuthenticationUtil.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/AuthenticationUtil.java
index d40dd28420..ab38e037fc 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/AuthenticationUtil.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/AuthenticationUtil.java
@@ -69,7 +69,7 @@ public class AuthenticationUtil
/**
* Helper method that gets the admin user name.
*
- * Usefule when testing using mocks.
+ * Useful when testing using mocks.
*
* @see org.alfresco.repo.security.authentication.AuthenticationUtil#getAdminUserName()
*/
@@ -77,5 +77,14 @@ public class AuthenticationUtil
{
return org.alfresco.repo.security.authentication.AuthenticationUtil.getAdminUserName();
}
-
+
+ /**
+ * Helper method that gets the system user name.
+ *
+ * @see org.alfresco.repo.security.authentication.AuthenticationUtil#getSystemUserName()
+ */
+ public String getSystemUserName()
+ {
+ return org.alfresco.repo.security.authentication.AuthenticationUtil.getSystemUserName();
+ }
}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
index 99d7bbea6d..f2d9b38525 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
@@ -53,10 +53,10 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
/** Application context */
protected ApplicationContext applicationContext;
-
+
/** internal node service */
private NodeService internalNodeService;
-
+
/** authentication helper */
protected AuthenticationUtil authenticationUtil;
@@ -84,7 +84,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
{
this.dictionaryService = dictionaryService;
}
-
+
/**
* @param authenticationUtil authentication util helper
*/
@@ -92,7 +92,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
{
this.authenticationUtil = authenticationUtil;
}
-
+
/**
* Helper to get internal node service.
*
@@ -104,10 +104,10 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
{
internalNodeService = (NodeService)applicationContext.getBean("dbNodeService");
}
-
+
return internalNodeService;
}
-
+
/**
* Gets the file plan component kind from the given node reference
*
@@ -127,7 +127,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
if (isFilePlanComponent(nodeRef))
{
result = FilePlanComponentKind.FILE_PLAN_COMPONENT;
-
+
if (isFilePlan(nodeRef))
{
result = FilePlanComponentKind.FILE_PLAN;
@@ -173,7 +173,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
result = FilePlanComponentKind.UNFILED_RECORD_FOLDER;
}
}
-
+
if (result != null)
{
map.put(nodeRef, result);
@@ -319,7 +319,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
ParameterCheck.mandatory("nodeRef", nodeRef);
boolean isHold = false;
- if (getInternalNodeService().exists(nodeRef) &&
+ if (getInternalNodeService().exists(nodeRef) &&
instanceOf(nodeRef, TYPE_HOLD))
{
isHold = true;
@@ -338,10 +338,23 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
return instanceOf(nodeRef, TYPE_TRANSFER);
}
-
+
+ /**
+ * Indicates whether the given node reference is an unfiled records container or not.
+ *
+ * @param nodeRef node reference
+ * @return boolean true if rma:unfiledRecordContainer or sub-type, false otherwise
+ */
+ public boolean isUnfiledRecordsContainer(NodeRef nodeRef)
+ {
+ ParameterCheck.mandatory("nodeRef", nodeRef);
+
+ return instanceOf(nodeRef, TYPE_UNFILED_RECORD_CONTAINER);
+ }
+
/**
* Indicates whether a record is complete or not.
- *
+ *
* @see org.alfresco.module.org_alfresco_module_rm.record.RecordService#isDeclared(org.alfresco.service.cmr.repository.NodeRef)
*/
public boolean isDeclared(NodeRef record)
@@ -361,22 +374,33 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
{
NodeRef result = null;
if (nodeRef != null)
- {
- result = (NodeRef)getInternalNodeService().getProperty(nodeRef, PROP_ROOT_NODEREF);
- if (result == null || !instanceOf(result, TYPE_FILE_PLAN))
+ {
+ Map transactionCache = TransactionalResourceHelper.getMap("rm.servicebase.getFilePlan");
+ if (transactionCache.containsKey(nodeRef))
{
- if (instanceOf(nodeRef, TYPE_FILE_PLAN))
+ result = transactionCache.get(nodeRef);
+ }
+ else
+ {
+ result = (NodeRef)getInternalNodeService().getProperty(nodeRef, PROP_ROOT_NODEREF);
+ if (result == null || !instanceOf(result, TYPE_FILE_PLAN))
{
- result = nodeRef;
- }
- else
- {
- ChildAssociationRef parentAssocRef = getInternalNodeService().getPrimaryParent(nodeRef);
- if (parentAssocRef != null)
+ if (instanceOf(nodeRef, TYPE_FILE_PLAN))
{
- result = getFilePlan(parentAssocRef.getParentRef());
+ result = nodeRef;
+ }
+ else
+ {
+ ChildAssociationRef parentAssocRef = getInternalNodeService().getPrimaryParent(nodeRef);
+ if (parentAssocRef != null)
+ {
+ result = getFilePlan(parentAssocRef.getParentRef());
+ }
}
}
+
+ // cache result in transaction
+ transactionCache.put(nodeRef, result);
}
}
@@ -392,11 +416,11 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
protected boolean instanceOf(NodeRef nodeRef, QName ofClassName)
{
ParameterCheck.mandatory("nodeRef", nodeRef);
- ParameterCheck.mandatory("ofClassName", ofClassName);
- QName className = getInternalNodeService().getType(nodeRef);
+ ParameterCheck.mandatory("ofClassName", ofClassName);
+ QName className = getInternalNodeService().getType(nodeRef);
return instanceOf(className, ofClassName);
}
-
+
private static Map instanceOfCache = new HashMap();
/**
@@ -410,25 +434,25 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
{
ParameterCheck.mandatory("className", className);
ParameterCheck.mandatory("ofClassName", ofClassName);
-
+
boolean result = false;
-
+
String key = className.toString() + "|" + ofClassName.toString();
if (instanceOfCache.containsKey(key))
{
result = instanceOfCache.get(key);
}
else
- {
+ {
if (ofClassName.equals(className) ||
dictionaryService.isSubClass(className, ofClassName))
{
result = true;
}
-
+
instanceOfCache.put(key, result);
}
-
+
return result;
}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java
index 9396a4b0d7..c90dc17da9 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionNodeServiceImpl.java
@@ -18,6 +18,8 @@
*/
package org.alfresco.module.org_alfresco_module_rm.version;
+import static org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl.RECORD_MODEL_URIS;
+
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
@@ -28,19 +30,17 @@ import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
-import org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl;
import org.alfresco.repo.version.Node2ServiceImpl;
import org.alfresco.repo.version.Version2Model;
import org.alfresco.repo.version.common.VersionUtil;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
-import org.apache.commons.lang.ArrayUtils;
/**
- * Extended version node service implementation that supports the retrieval of
+ * Extended version node service implementation that supports the retrieval of
* recorded version state.
- *
+ *
* @author Roy Wetherall
* @since 2.3
*/
@@ -49,7 +49,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
{
/** record service */
private RecordService recordService;
-
+
/**
* @param recordService record service
*/
@@ -57,7 +57,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
{
this.recordService = recordService;
}
-
+
/**
* @see org.alfresco.repo.version.Node2ServiceImpl#getProperties(org.alfresco.service.cmr.repository.NodeRef)
*/
@@ -65,7 +65,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
public Map getProperties(NodeRef nodeRef) throws InvalidNodeRefException
{
// TODO only supported for Version2
-
+
NodeRef converted = VersionUtil.convertNodeRef(nodeRef);
if (dbNodeService.hasAspect(converted, ASPECT_RECORDED_VERSION))
{
@@ -78,41 +78,41 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
return super.getProperties(nodeRef);
}
}
-
+
/**
* Process properties map before returning as frozen state.
- *
+ *
* @param properties properties map
* @return {@link Map}<{@link QName}, {@link Serializable}> processed property map
*/
protected Map processProperties(NodeRef version, Map properties)
{
Map cloneProperties = new HashMap(properties);
-
+
// revert modified record name
properties.put(ContentModel.PROP_NAME, properties.get(RecordsManagementModel.PROP_ORIGIONAL_NAME));
-
+
// remove all rma, rmc, rmr and rmv properties
for (QName property : cloneProperties.keySet())
{
if (!PROP_RECORDABLE_VERSION_POLICY.equals(property) &&
- !PROP_FILE_PLAN.equals(property) &&
- (recordService.isRecordMetadataProperty(property) ||
- ArrayUtils.contains(RecordServiceImpl.RECORD_MODEL_URIS, property.getNamespaceURI())))
+ !PROP_FILE_PLAN.equals(property) &&
+ (recordService.isRecordMetadataProperty(property) ||
+ RECORD_MODEL_URIS.contains(property.getNamespaceURI())))
{
- properties.remove(property);
+ properties.remove(property);
}
}
-
+
// do standard property processing
processVersionProperties(version, properties);
-
+
return properties;
}
-
+
/**
* Process version properties.
- *
+ *
* @param version version node reference
* @param properties properties map
*/
@@ -120,12 +120,12 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
{
// get version properties
Map versionProperties = dbNodeService.getProperties(version);
-
+
if (versionProperties != null)
{
String versionLabel = (String)versionProperties.get(Version2Model.PROP_QNAME_VERSION_LABEL);
properties.put(ContentModel.PROP_VERSION_LABEL, versionLabel);
-
+
// Convert frozen sys:referenceable properties
NodeRef nodeRef = (NodeRef)versionProperties.get(Version2Model.PROP_QNAME_FROZEN_NODE_REF);
if (nodeRef != null)
@@ -134,42 +134,42 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
properties.put(ContentModel.PROP_STORE_IDENTIFIER, nodeRef.getStoreRef().getIdentifier());
properties.put(ContentModel.PROP_NODE_UUID, nodeRef.getId());
}
-
+
Long dbid = (Long)versionProperties.get(Version2Model.PROP_QNAME_FROZEN_NODE_DBID);
properties.put(ContentModel.PROP_NODE_DBID, dbid);
-
+
// Convert frozen cm:auditable properties
String creator = (String)versionProperties.get(Version2Model.PROP_QNAME_FROZEN_CREATOR);
if (creator != null)
{
properties.put(ContentModel.PROP_CREATOR, creator);
}
-
+
Date created = (Date)versionProperties.get(Version2Model.PROP_QNAME_FROZEN_CREATED);
if (created != null)
{
properties.put(ContentModel.PROP_CREATED, created);
}
-
+
// TODO - check use-cases for get version, revert, restore ....
String modifier = (String)versionProperties.get(Version2Model.PROP_QNAME_FROZEN_MODIFIER);
if (modifier != null)
{
properties.put(ContentModel.PROP_MODIFIER, modifier);
}
-
+
Date modified = (Date)versionProperties.get(Version2Model.PROP_QNAME_FROZEN_MODIFIED);
if (modified != null)
{
properties.put(ContentModel.PROP_MODIFIED, modified);
}
-
+
Date accessed = (Date)versionProperties.get(Version2Model.PROP_QNAME_FROZEN_ACCESSED);
if (accessed != null)
{
properties.put(ContentModel.PROP_ACCESSED, accessed);
- }
-
+ }
+
String owner = (String)versionProperties.get(PROP_FROZEN_OWNER);
if (owner != null)
{
@@ -177,7 +177,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
}
}
}
-
+
/**
* @see org.alfresco.repo.version.Node2ServiceImpl#getAspects(org.alfresco.service.cmr.repository.NodeRef)
*/
@@ -185,7 +185,7 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
public Set getAspects(NodeRef nodeRef) throws InvalidNodeRefException
{
// TODO only supported for Version2
-
+
NodeRef converted = VersionUtil.convertNodeRef(nodeRef);
if (dbNodeService.hasAspect(converted, ASPECT_RECORDED_VERSION))
{
@@ -198,34 +198,34 @@ public class RecordableVersionNodeServiceImpl extends Node2ServiceImpl
return super.getAspects(nodeRef);
}
}
-
+
/**
* Process frozen aspects.
- *
+ *
* @param aspects aspect set
* @return {@link Set}<{@link QName}> processed aspect set
*/
protected Set processAspects(Set aspects)
{
Set result = new HashSet(aspects);
-
+
// remove version aspects
result.remove(ASPECT_VERSION);
result.remove(ASPECT_RECORDED_VERSION);
-
+
// remove rm aspects
for (QName aspect : aspects)
{
if (!ASPECT_VERSIONABLE.equals(aspect) &&
- (recordService.isRecordMetadataAspect(aspect) ||
- ArrayUtils.contains(RecordServiceImpl.RECORD_MODEL_URIS, aspect.getNamespaceURI())))
+ (recordService.isRecordMetadataAspect(aspect) ||
+ RECORD_MODEL_URIS.contains(aspect.getNamespaceURI())))
{
- result.remove(aspect);
+ result.remove(aspect);
}
}
-
+
// remove custom record meta-data aspects
-
+
return result;
}
}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java
index 374a06db1f..bf6f64c1fc 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java
@@ -18,34 +18,28 @@
*/
package org.alfresco.module.org_alfresco_module_rm.version;
+import static org.codehaus.plexus.util.StringUtils.isNotBlank;
+
import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
+import org.alfresco.module.org_alfresco_module_rm.model.security.ModelSecurityService;
+import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipService;
-import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil;
import org.alfresco.repo.policy.PolicyScope;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
-import org.alfresco.repo.security.permissions.impl.ExtendedPermissionService;
import org.alfresco.repo.version.Version2Model;
import org.alfresco.repo.version.Version2ServiceImpl;
import org.alfresco.repo.version.VersionModel;
-import org.alfresco.service.cmr.model.FileFolderService;
-import org.alfresco.service.cmr.model.FileInfo;
-import org.alfresco.service.cmr.model.FileNotFoundException;
-import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.security.OwnableService;
import org.alfresco.service.cmr.version.ReservedVersionNameException;
import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionHistory;
@@ -70,30 +64,24 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
/** key used to indicate a recordable version */
public static final String KEY_RECORDABLE_VERSION = "recordable-version";
public static final String KEY_FILE_PLAN = "file-plan";
-
+
/** version record property */
public static final String PROP_VERSION_RECORD = "RecordVersion";
/** file plan service */
- protected FilePlanService filePlanService;
-
- /** file folder service */
- protected FileFolderService fileFolderService;
-
- /** extended permission service */
- protected ExtendedPermissionService extendedPermissionService;
-
- /** ownable service */
- protected OwnableService ownableService;
-
- /** extended security service */
- protected ExtendedSecurityService extendedSecurityService;
+ private FilePlanService filePlanService;
/** authentication util helper */
- protected AuthenticationUtil authenticationUtil;
-
+ private AuthenticationUtil authenticationUtil;
+
/** relationship service */
- protected RelationshipService relationshipService;
+ private RelationshipService relationshipService;
+
+ /** record service */
+ private RecordService recordService;
+
+ /** model security service */
+ private ModelSecurityService modelSecurityService;
/**
* @param filePlanService file plan service
@@ -103,38 +91,6 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
this.filePlanService = filePlanService;
}
- /**
- * @param fileFolderService file folder service
- */
- public void setFileFolderService(FileFolderService fileFolderService)
- {
- this.fileFolderService = fileFolderService;
- }
-
- /**
- * @param extendedPermissionService extended permission service
- */
- public void setExtendedPermissionService(ExtendedPermissionService extendedPermissionService)
- {
- this.extendedPermissionService = extendedPermissionService;
- }
-
- /**
- * @param ownableService ownable service
- */
- public void setOwnableService(OwnableService ownableService)
- {
- this.ownableService = ownableService;
- }
-
- /**
- * @param extendedSecurityService extended security service
- */
- public void setExtendedSecurityService(ExtendedSecurityService extendedSecurityService)
- {
- this.extendedSecurityService = extendedSecurityService;
- }
-
/**
* @param authenticationUtil authentication util helper
*/
@@ -142,7 +98,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
{
this.authenticationUtil = authenticationUtil;
}
-
+
/**
* @param relationshipService relationship service
*/
@@ -150,6 +106,22 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
{
this.relationshipService = relationshipService;
}
+
+ /**
+ * @param recordService record service
+ */
+ public void setRecordService(RecordService recordService)
+ {
+ this.recordService = recordService;
+ }
+
+ /**
+ * @param modelSecurityService model security service
+ */
+ public void setModelSecurityService(ModelSecurityService modelSecurityService)
+ {
+ this.modelSecurityService = modelSecurityService;
+ }
/**
* @see org.alfresco.repo.version.Version2ServiceImpl#createVersion(org.alfresco.service.cmr.repository.NodeRef, java.util.Map, int)
@@ -217,12 +189,19 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
*/
private NodeRef getFilePlan()
{
- NodeRef filePlan = filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID);
- if (filePlan == null)
+ return authenticationUtil.runAsSystem(new RunAsWork()
{
- throw new AlfrescoRuntimeException("Can't create a recorded version, because there is no file plan.");
- }
- return filePlan;
+ @Override
+ public NodeRef doWork() throws Exception
+ {
+ NodeRef filePlan = filePlanService.getFilePlanBySiteId(FilePlanService.DEFAULT_RM_SITE_ID);
+ if (filePlan == null)
+ {
+ throw new AlfrescoRuntimeException("Can't create a recorded version, because there is no file plan.");
+ }
+ return filePlan;
+ }
+ });
}
/**
@@ -306,6 +285,12 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
// disable other behaviours that we don't want to trigger during this process
policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
policyBehaviourFilter.disableBehaviour(ContentModel.TYPE_MULTILINGUAL_CONTAINER);
+
+ // disable model security check
+ modelSecurityService.disable();
+
+ // disable property editable check
+ recordService.disablePropertyEditableCheck();
try
{
@@ -320,46 +305,23 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
final NodeRef nodeRef = (NodeRef)standardVersionProperties.get(Version2Model.PROP_QNAME_FROZEN_NODE_REF);
// create record
- final NodeRef record = createRecord(nodeRef, filePlan);
-
+ final NodeRef record = recordService.createRecordFromCopy(filePlan, nodeRef);
+
// apply version record aspect to record
PropertyMap versionRecordProps = new PropertyMap(3);
versionRecordProps.put(PROP_VERSIONED_NODEREF, nodeRef);
- versionRecordProps.put(RecordableVersionModel.PROP_VERSION_LABEL,
+ versionRecordProps.put(RecordableVersionModel.PROP_VERSION_LABEL,
standardVersionProperties.get(
QName.createQName(Version2Model.NAMESPACE_URI,
Version2Model.PROP_VERSION_LABEL)));
- versionRecordProps.put(RecordableVersionModel.PROP_VERSION_DESCRIPTION,
+ versionRecordProps.put(RecordableVersionModel.PROP_VERSION_DESCRIPTION,
standardVersionProperties.get(
QName.createQName(Version2Model.NAMESPACE_URI,
Version2Model.PROP_VERSION_DESCRIPTION)));
nodeService.addAspect(record, ASPECT_VERSION_RECORD, versionRecordProps);
-
- // wire record up to previous record
- VersionHistory versionHistory = getVersionHistory(nodeRef);
- if (versionHistory != null)
- {
- Collection previousVersions = versionHistory.getAllVersions();
- for (Version previousVersion : previousVersions)
- {
- // look for the associated record
- final NodeRef previousRecord = (NodeRef)previousVersion.getVersionProperties().get(PROP_VERSION_RECORD);
- if (previousRecord != null)
- {
- authenticationUtil.runAsSystem(new RunAsWork()
- {
- @Override
- public Void doWork() throws Exception
- {
- // indicate that the new record versions the previous record
- relationshipService.addRelationship("versions", record, previousRecord);
- return null;
- }
- });
- break;
- }
- }
- }
+
+ // wire record up to previous record
+ linkToPreviousVersionRecord(nodeRef, record);
// create version nodeRef
ChildAssociationRef childAssocRef = dbNodeService.createNode(
@@ -381,6 +343,12 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
}
finally
{
+ // enable model security check
+ modelSecurityService.enable();
+
+ // enable property editable check
+ recordService.enablePropertyEditableCheck();
+
// Enable behaviours
this.policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_VERSIONABLE);
this.policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
@@ -388,7 +356,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
}
// If the auditable aspect is not there then add it to the 'version' node (after original aspects have been frozen)
- if (dbNodeService.hasAspect(versionNodeRef, ContentModel.ASPECT_AUDITABLE) == false)
+ if (!dbNodeService.hasAspect(versionNodeRef, ContentModel.ASPECT_AUDITABLE))
{
dbNodeService.addAspect(versionNodeRef, ContentModel.ASPECT_AUDITABLE, null);
}
@@ -400,91 +368,59 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
return versionNodeRef;
}
-
+
/**
- * Create record from current version
- *
- * @param nodeRef state to freeze
- * @param filePlan destination file plan
- * @return {@link NodeRef} versioned record
+ * Helper method to link the record to the previous version record
+ *
+ * @param nodeRef noderef source node reference
+ * @param record record record node reference
*/
- private NodeRef createRecord(final NodeRef nodeRef, final NodeRef filePlan)
+ private void linkToPreviousVersionRecord(final NodeRef nodeRef, final NodeRef record)
{
- return authenticationUtil.runAs(new RunAsWork()
+ final NodeRef latestRecordVersion = getLatestVersionRecord(nodeRef);
+ if (latestRecordVersion != null)
{
- public NodeRef doWork() throws Exception
+ authenticationUtil.runAsSystem(new RunAsWork()
{
- // get the unfiled record folder
- final NodeRef unfiledRecordFolder = filePlanService.getUnfiledContainer(filePlan);
-
- // get the documents readers
- Long aclId = dbNodeService.getNodeAclId(nodeRef);
- Set readers = extendedPermissionService.getReaders(aclId);
- Set writers = extendedPermissionService.getWriters(aclId);
-
- // add the current owner to the list of extended writers
- Set modifiedWrtiers = new HashSet(writers);
- if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_OWNABLE))
+ @Override
+ public Void doWork() throws Exception
{
- String owner = ownableService.getOwner(nodeRef);
- if (owner != null && !owner.isEmpty() && !owner.equals(OwnableService.NO_OWNER))
- {
- modifiedWrtiers.add(owner);
- }
+ // indicate that the new record versions the previous record
+ relationshipService.addRelationship("versions", record, latestRecordVersion);
+ return null;
}
-
- // add the current user as extended writer
- modifiedWrtiers.add(authenticationUtil.getFullyAuthenticatedUser());
-
- // copy version state and create record
- NodeRef record = null;
- try
+ });
+ }
+ }
+
+ /**
+ * Helper to get the latest version record for a given document (ie non-record)
+ *
+ * @param nodeRef node reference
+ * @return NodeRef latest version record, null otherwise
+ */
+ private NodeRef getLatestVersionRecord(NodeRef nodeRef)
+ {
+ NodeRef versionRecord = null;
+
+ // wire record up to previous record
+ VersionHistory versionHistory = getVersionHistory(nodeRef);
+ if (versionHistory != null)
+ {
+ Collection previousVersions = versionHistory.getAllVersions();
+ for (Version previousVersion : previousVersions)
+ {
+ // look for the associated record
+ final NodeRef previousRecord = (NodeRef)previousVersion.getVersionProperties().get(PROP_VERSION_RECORD);
+ if (previousRecord != null)
{
- List originalAssocs = null;
- if (dbNodeService.hasAspect(nodeRef, ContentModel.ASPECT_COPIEDFROM))
- {
- // take a note of any copyFrom information already on the node
- originalAssocs = dbNodeService.getTargetAssocs(nodeRef, ContentModel.ASSOC_ORIGINAL);
- }
-
- // create a copy of the original state and add it to the unfiled record container
- FileInfo recordInfo = fileFolderService.copy(nodeRef, unfiledRecordFolder, null);
- record = recordInfo.getNodeRef();
-
- // remove added copy assocs
- List recordAssocs = dbNodeService.getTargetAssocs(record, ContentModel.ASSOC_ORIGINAL);
- for (AssociationRef recordAssoc : recordAssocs)
- {
- dbNodeService.removeAssociation(
- recordAssoc.getSourceRef(),
- recordAssoc.getTargetRef(),
- ContentModel.ASSOC_ORIGINAL);
- }
-
- // re-add origional assocs or remove aspect
- if (originalAssocs == null)
- {
- dbNodeService.removeAspect(record, ContentModel.ASPECT_COPIEDFROM);
- }
- else
- {
- for (AssociationRef originalAssoc : originalAssocs)
- {
- dbNodeService.createAssociation(originalAssoc.getSourceRef(), originalAssoc.getTargetRef(), ContentModel.ASSOC_ORIGINAL);
- }
- }
+ versionRecord = previousRecord;
+ break;
}
- catch (FileNotFoundException e)
- {
- throw new AlfrescoRuntimeException("Can't create recorded version, because copy fails.", e);
- }
-
- // set extended security on record
- extendedSecurityService.addExtendedSecurity(record, readers, writers);
-
- return record;
}
- }, authenticationUtil.getAdminUserName());
+ }
+
+ return versionRecord;
}
/**
@@ -526,4 +462,20 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl
return version;
}
+
+ /**
+ * @see org.alfresco.repo.version.Version2ServiceImpl#revert(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.version.Version, boolean)
+ */
+ @Override
+ public void revert(NodeRef nodeRef, Version version, boolean deep)
+ {
+ String versionPolicy = (String) dbNodeService.getProperty(nodeRef, PROP_RECORDABLE_VERSION_POLICY);
+
+ super.revert(nodeRef, version, deep);
+
+ if (isNotBlank(versionPolicy))
+ {
+ dbNodeService.setProperty(nodeRef, PROP_RECORDABLE_VERSION_POLICY, versionPolicy);
+ }
+ }
}
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java
index 74d199459b..b7957d7b71 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/vital/BroadcastVitalRecordDefinitionAction.java
@@ -78,7 +78,7 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra
*/
private void propagateChangeToChildrenOf(NodeRef actionedUponNodeRef)
{
- Map parentProps = nodeService.getProperties(actionedUponNodeRef);
+ Map parentProps = getNodeService().getProperties(actionedUponNodeRef);
// parent vital record indicator, default to null if not set
boolean parentVri = false;
@@ -90,41 +90,41 @@ public class BroadcastVitalRecordDefinitionAction extends RMActionExecuterAbstra
Period parentReviewPeriod = (Period) parentProps.get(PROP_REVIEW_PERIOD);
- List assocs = this.nodeService.getChildAssocs(actionedUponNodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
+ List assocs = this.getNodeService().getChildAssocs(actionedUponNodeRef, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef nextAssoc : assocs)
{
NodeRef nextChild = nextAssoc.getChildRef();
if (filePlanService.isFilePlanComponent(nextChild) &&
- !freezeService.isFrozen(nextChild))
+ !getFreezeService().isFrozen(nextChild))
{
// If the child is a record, then the VitalRecord aspect needs to be applied or updated
- if (recordService.isRecord(nextChild))
+ if (getRecordService().isRecord(nextChild))
{
if (parentVri)
{
- VitalRecordDefinition vrDefn = vitalRecordService.getVitalRecordDefinition(nextChild);
+ VitalRecordDefinition vrDefn = getVitalRecordService().getVitalRecordDefinition(nextChild);
Map aspectProps = new HashMap