Merge V3.4 TO HEAD

30844 : ALF-9544 Inbound email restricts file name to 86 characters or less.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-10-03 13:51:54 +00:00
parent c8763bec54
commit 1c779e6ff3
3 changed files with 331 additions and 4 deletions

View File

@@ -274,17 +274,20 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
NodeRef childNodeRef = nodeService.getChildByName(parent, assocType, name);
if (childNodeRef != null)
{
// The node is present already. Make sure the name csae is correct
// The node is present already. Make sure the name case is correct
nodeService.setProperty(childNodeRef, ContentModel.PROP_NAME, name);
}
else
{
Map<QName, Serializable> contentProps = new HashMap<QName, Serializable>();
contentProps.put(ContentModel.PROP_NAME, name);
QName assocName = QName.createQNameWithValidLocalName(NamespaceService.CONTENT_MODEL_1_0_URI, name);
ChildAssociationRef associationRef = nodeService.createNode(
parent,
assocType,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name),
assocName,
ContentModel.TYPE_CONTENT,
contentProps);
childNodeRef = associationRef.getChildRef();

View File

@@ -63,11 +63,11 @@ public class FolderEmailMessageHandler extends AbstractEmailMessageHandler
{
if (log.isDebugEnabled())
{
log.debug("Message is psocessing by SpaceMailMessageHandler");
log.debug("Message is processing by FolderMailMessageHandler");
}
try
{
// Check type of the node. It must be a SPACE
// Check type of the node. It must be a FOLDER
QName nodeTypeQName = getNodeService().getType(nodeRef);
if (getDictionaryService().isSubClass(nodeTypeQName, ContentModel.TYPE_FOLDER))