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

RM-880: Cannot upload file into RM site over FTP/NFS file protocols

Browse Source 
* if record has NO_CONTENT when assoc is created, postpone filling untill NO_CONTENT is removed



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-26 01:30:50 +00:00
parent 402110f843
commit c69c9964cc
1 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -56,6 +56,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.security.permissions.impl.ExtendedPermissionService; import org.alfresco.repo.security.permissions.impl.ExtendedPermissionService;
import org.alfresco.repo.transaction.TransactionalResourceHelper;
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.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -97,7 +98,9 @@ public class RecordServiceImpl implements RecordService,
RecordsManagementCustomModel, RecordsManagementCustomModel,
NodeServicePolicies.OnCreateChildAssociationPolicy, NodeServicePolicies.OnCreateChildAssociationPolicy,
NodeServicePolicies.OnUpdatePropertiesPolicy, NodeServicePolicies.OnUpdatePropertiesPolicy,
ApplicationContextAware ApplicationContextAware,
NodeServicePolicies.OnAddAspectPolicy,
NodeServicePolicies.OnRemoveAspectPolicy
{ {
/** Logger */ /** Logger */
private static Log logger = LogFactory.getLog(RecordServiceImpl.class); private static Log logger = LogFactory.getLog(RecordServiceImpl.class);
@@ -355,19 +358,41 @@ public class RecordServiceImpl implements RecordService,
policyComponent.bindClassBehaviour( policyComponent.bindClassBehaviour(
NodeServicePolicies.OnAddAspectPolicy.QNAME, NodeServicePolicies.OnAddAspectPolicy.QNAME,
ContentModel.ASPECT_NO_CONTENT, ContentModel.ASPECT_NO_CONTENT,
new JavaBehaviour(this, "processNoContentAspect", NotificationFrequency.EVERY_EVENT)); new JavaBehaviour(this, "onAddAspect", NotificationFrequency.EVERY_EVENT));
policyComponent.bindClassBehaviour( policyComponent.bindClassBehaviour(
NodeServicePolicies.OnRemoveAspectPolicy.QNAME, NodeServicePolicies.OnRemoveAspectPolicy.QNAME,
ContentModel.ASPECT_NO_CONTENT, ContentModel.ASPECT_NO_CONTENT,
new JavaBehaviour(this, "processNoContentAspect", NotificationFrequency.EVERY_EVENT)); new JavaBehaviour(this, "onRemoveAspect", NotificationFrequency.EVERY_EVENT));
}
/**
* @see org.alfresco.repo.node.NodeServicePolicies.OnRemoveAspectPolicy#onRemoveAspect(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName)
*/
@Override
public void onRemoveAspect(NodeRef nodeRef, QName aspect)
{
if (nodeService.hasAspect(nodeRef, ASPECT_RECORD) == true)
{
switchNames(nodeRef);
}
else
{
// check whether filling is pending aspect removal
Set<NodeRef> pendingFilling = TransactionalResourceHelper.getSet("pendingFilling");
if (pendingFilling.contains(nodeRef) == true)
{
file(nodeRef);
}
}
} }
/** /**
* @see org.alfresco.repo.node.NodeServicePolicies.OnAddAspectPolicy#onAddAspect(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName) * @see org.alfresco.repo.node.NodeServicePolicies.OnAddAspectPolicy#onAddAspect(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName)
*/ */
public void processNoContentAspect(NodeRef nodeRef, QName aspectTypeQName) @Override
public void onAddAspect(NodeRef nodeRef, QName aspect)
{ {
switchNames(nodeRef); switchNames(nodeRef);
} }
/** /**
@@ -393,15 +418,24 @@ public class RecordServiceImpl implements RecordService,
} }
catch (FileExistsException e) catch (FileExistsException e)
{ {
e.printStackTrace(); if (logger.isDebugEnabled() == true)
{
logger.debug(e.getMessage());
}
} }
catch (InvalidNodeRefException e) catch (InvalidNodeRefException e)
{ {
e.printStackTrace(); if (logger.isDebugEnabled() == true)
{
logger.debug(e.getMessage());
}
} }
catch (FileNotFoundException e) catch (FileNotFoundException e)
{ {
e.printStackTrace(); if (logger.isDebugEnabled() == true)
{
logger.debug(e.getMessage());
}
} }
} }
@@ -424,8 +458,17 @@ public class RecordServiceImpl implements RecordService,
nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) == false && nodeService.getType(nodeRef).equals(TYPE_RECORD_FOLDER) == false &&
nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY) == false) nodeService.getType(nodeRef).equals(TYPE_RECORD_CATEGORY) == false)
{ {
// create and file the content as a record if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT) == true)
file(nodeRef); {
// we need to postpone filling until the NO_CONTENT aspect is removed
Set<NodeRef> pendingFilling = TransactionalResourceHelper.getSet("pendingFilling");
pendingFilling.add(nodeRef);
}
else
{
// create and file the content as a record
file(nodeRef);
}
} }
return null; return null;