From 380bd69941e655ff0695955fb7144983169e9557 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Fri, 1 Mar 2013 12:32:11 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX to HEAD 47256: Merged DEV to V4.1-BUG-FIX 47145: ALF-17877 : CLONE - The deleted via Sharepoint document is not removed from Alfresco but hidden aspect is added for it Setting webdav client for all webdav requests in SPP module. 47257: ALF-17816 (Incorrect tooltip 'Locked by' icon for other user) 47285: ALF-17635: Incorrect behavior of Move action in Update rule and Outbound rule in Share - Altered MoveActionExcecuter so that it doesn't fire on a working copy and will hence wait for checkin 47287: Fixes ALF-2590: Calendar doesn't handle 401 errors properly: - callUtils now pass on non 200 status codes (rather than swallowing errors) - updates create-event template to handle missing data. 47288: ALF-17057: SPP: Extra version is created when add new document via Document Connection on MacOS X Lion - Now we ignore empty content when we create the initial version 47290: ALF-16931: Bootstrapped users with Uppercase name cannot see site they have been invited to - Changed the code to be conditional on association type 47296: ALF-4565: Incorrect behaviour of Edit Online action if document's name contains wildcards - URLs were incorrectly being double decoded in DefaultAuthenticationHandler 47308: Merged DEV to V4.1-BUG-FIX 47298: ALF-17907 : specified index does not exist during upgrade to 4.1.2 The droppping of alf_node.store_id index was marked as optional to support the upgrades from originally Alfresco 2.2 for Oracle DB. 47314: Fixed ALF-13679 "Cannot play a movie file in Preview, which has double byte characters in the file name" 47322: ALL LANGS: Translation updates based on EN r47138 47325: ALL LANGS: Translation updates based on EN r47138 47327: Removes unused TinyMCE files (as part of ALF-17451 ) 47329: FR, IT, NL: Fixes ALF-17413 47331: Implements fix suggested in ALF-17451, updates fixes for ALF-8486, ALF-10690 and ALF-11000. 47334: ALF-16991: Editing Rich Text files in TinyMCE loses some formatting. 47340: Merged DEV to V4.1-BUG-FIX 47306: ALF-17907 : specified index does not exist during upgrade to 4.1.2 The droppping of alf_node.store_id index was marked as optional to support the upgrades from originally Alfresco 2.2 for MS SQL Server. 47353: Merged V4.1-BUG-FIX-2012_11_26 to V4.1-BUG-FIX 44182: ALF-15970: OpenOffice form not found Show error message if form definition could not be found 47383: ALF-17222: "Protected attribute not take into account for target of associations" 47392: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_02_26 to BRANCHES/DEV/V4.1-BUG-FIX: 47313: ALF-18006 : Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream 47402: ALF-18212: SOLR OOTB cache sizes are too big and require >20GB heap space - Reduced default cache sizes from 512 to 64 47405: Fixes: ALF-14412 - Tag filtering in blogs 47407: Fix failing unit tests - use public services where transactions are required 47410: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 47293: (RECORD ONLY) Merged DEV to V3.4-BUG-FIX 43417: ALF-14710 JUnit test for WebServiceSuiteSystemTest project fails - testPropertySetGet() method was updated in RepositoryServiceSystemTest class 47311: ALF-18213 / ALF-18005: webscript guestDownload does not set Content-Dispositon HTTP header - Follow on from ALF-9817 - Now it does it properly 47414: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 47332: ALF-17640: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 45828: Additional fix for ALF-17153 FTS query parser FTSQueryParser is not debuggable 47385: ALF-17935: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX 42969: Merged DEV to PATCHES/V4.0.2 42967: MNT-158: SharePoint Protocol Opening Documents in Read-Only for Site Consumer with Collaborator Privileges Remove manual throwing of AccessDeniedException is user has "consumer" or "contributor" role. Create "links" container from system user. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/action-services-context.xml | 1 + .../messages/bootstrap-spaces_de.properties | 3 + .../messages/bootstrap-spaces_es.properties | 3 + .../messages/bootstrap-spaces_fr.properties | 3 + .../messages/bootstrap-spaces_it.properties | 3 + .../messages/bootstrap-spaces_ja.properties | 3 + .../bootstrap-spaces_nb_NO.properties | 3 + .../messages/bootstrap-spaces_nl.properties | 3 + .../messages/bootstrap-spaces_ru.properties | 3 + .../bootstrap-spaces_zh_CN.properties | 3 + config/alfresco/model/modelSchema.xsd | 2 - config/alfresco/opencmis-context.xml | 6 +- .../cmis/mapping/CMISPropertyServiceTest.java | 23 ++++++++ .../cmis/mapping/CMISServicesImpl.java | 3 +- .../AlfrescoCmisStreamInterceptor.java | 20 +++++++ .../java/org/alfresco/opencmis/CMISTest.java | 55 +++++++++++++++++++ .../action/executer/MoveActionExecuter.java | 38 ++++++++++--- .../calendar/CalendarServiceImplTest.java | 2 +- .../discussion/DiscussionServiceImplTest.java | 2 +- .../repo/importer/ImporterComponent.java | 3 +- 20 files changed, 165 insertions(+), 17 deletions(-) diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml index 6ae0233d68..053bf1a317 100644 --- a/config/alfresco/action-services-context.xml +++ b/config/alfresco/action-services-context.xml @@ -438,6 +438,7 @@ + diff --git a/config/alfresco/messages/bootstrap-spaces_de.properties b/config/alfresco/messages/bootstrap-spaces_de.properties index fa2b763dc5..e09367c32c 100755 --- a/config/alfresco/messages/bootstrap-spaces_de.properties +++ b/config/alfresco/messages/bootstrap-spaces_de.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=Benutzerdefinierte Definitionen spaces.imap_attachments.name=IMAP-Anlagen spaces.imap_attachments.description=IMAP-Anlagen +spaces.imap_home.name=IMAP-Startseite +spaces.imap_home.description=IMAP-Startseite + spaces.imapConfig.name=Imap Configs spaces.imapConfig.description=Imap Configs diff --git a/config/alfresco/messages/bootstrap-spaces_es.properties b/config/alfresco/messages/bootstrap-spaces_es.properties index d1e4da0830..3144a22598 100755 --- a/config/alfresco/messages/bootstrap-spaces_es.properties +++ b/config/alfresco/messages/bootstrap-spaces_es.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=Definiciones gestionadas por usuario spaces.imap_attachments.name=Adjuntos IMAP spaces.imap_attachments.description=Adjuntos IMAP +spaces.imap_home.name=Inicio IMAP +spaces.imap_home.description=Inicio IMAP + spaces.imapConfig.name=Configuraciones IMAP spaces.imapConfig.description=Configuraciones IMAP diff --git a/config/alfresco/messages/bootstrap-spaces_fr.properties b/config/alfresco/messages/bootstrap-spaces_fr.properties index bde0cf43ba..9ada948d95 100755 --- a/config/alfresco/messages/bootstrap-spaces_fr.properties +++ b/config/alfresco/messages/bootstrap-spaces_fr.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=D\u00e9finitions personnalis\u00e9es spaces.imap_attachments.name=Pi\u00e8ces jointes IMAP spaces.imap_attachments.description=Pi\u00e8ces jointes IMAP +spaces.imap_home.name=Racine IMAP +spaces.imap_home.description=Racine IMAP + spaces.imapConfig.name=Configurations IMAP spaces.imapConfig.description=Configurations IMAP diff --git a/config/alfresco/messages/bootstrap-spaces_it.properties b/config/alfresco/messages/bootstrap-spaces_it.properties index e940271eda..c228735019 100755 --- a/config/alfresco/messages/bootstrap-spaces_it.properties +++ b/config/alfresco/messages/bootstrap-spaces_it.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=Definizioni gestite dall'utente spaces.imap_attachments.name=Allegato Imap spaces.imap_attachments.description=Allegato Imap +spaces.imap_home.name=Homepage IMAP +spaces.imap_home.description=Homepage IMAP + spaces.imapConfig.name=Configurazioni IMAP spaces.imapConfig.description=Configurazioni IMAP diff --git a/config/alfresco/messages/bootstrap-spaces_ja.properties b/config/alfresco/messages/bootstrap-spaces_ja.properties index 07d42f5ac0..4e36e9c258 100755 --- a/config/alfresco/messages/bootstrap-spaces_ja.properties +++ b/config/alfresco/messages/bootstrap-spaces_ja.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=\u30e6\u30fc\u30b6\u30fc\u7ba1\u7406\u306e\u5b9a\u spaces.imap_attachments.name=IMAP\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb spaces.imap_attachments.description=IMAP\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb +spaces.imap_home.name=IMAP\u30db\u30fc\u30e0 +spaces.imap_home.description=IMAP\u30db\u30fc\u30e0 + spaces.imapConfig.name=IMAP\u306e\u69cb\u6210 spaces.imapConfig.description=IMAP\u306e\u69cb\u6210 diff --git a/config/alfresco/messages/bootstrap-spaces_nb_NO.properties b/config/alfresco/messages/bootstrap-spaces_nb_NO.properties index b20860347a..23330863ac 100755 --- a/config/alfresco/messages/bootstrap-spaces_nb_NO.properties +++ b/config/alfresco/messages/bootstrap-spaces_nb_NO.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=Brukeradministrerte definisjoner spaces.imap_attachments.name=IMAP-vedlegg spaces.imap_attachments.description=IMAP-vedlegg +spaces.imap_home.name=IMAP-hjem +spaces.imap_home.description=IMAP-hjem + spaces.imapConfig.name=Imap-konfigurasjoner spaces.imapConfig.description=Imap-konfigurasjoner diff --git a/config/alfresco/messages/bootstrap-spaces_nl.properties b/config/alfresco/messages/bootstrap-spaces_nl.properties index 933c47f0bf..6396ba3ee9 100755 --- a/config/alfresco/messages/bootstrap-spaces_nl.properties +++ b/config/alfresco/messages/bootstrap-spaces_nl.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=Door gebruiker beheerde definities spaces.imap_attachments.name=Imap-bijlagen spaces.imap_attachments.description=Imap-bijlagen +spaces.imap_home.name=IMAP-startpagina +spaces.imap_home.description=IMAP-startpagina + spaces.imapConfig.name=Imap-configuraties spaces.imapConfig.description=Imap-configuraties diff --git a/config/alfresco/messages/bootstrap-spaces_ru.properties b/config/alfresco/messages/bootstrap-spaces_ru.properties index 0b0322d435..59cd6a328c 100755 --- a/config/alfresco/messages/bootstrap-spaces_ru.properties +++ b/config/alfresco/messages/bootstrap-spaces_ru.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=\u0423\u043F\u0440\u0430\u0432\u043B\u044F\u0435\u spaces.imap_attachments.name=\u0412\u043B\u043E\u0436\u0435\u043D\u0438\u044F IMAP spaces.imap_attachments.description=\u0412\u043B\u043E\u0436\u0435\u043D\u0438\u044F IMAP +spaces.imap_home.name=\u0414\u043e\u043c\u0430\u0448\u043d\u0435\u0435 \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e IMAP +spaces.imap_home.description=\u0414\u043e\u043c\u0430\u0448\u043d\u0435\u0435 \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e IMAP + spaces.imapConfig.name=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 Imap spaces.imapConfig.description=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 Imap diff --git a/config/alfresco/messages/bootstrap-spaces_zh_CN.properties b/config/alfresco/messages/bootstrap-spaces_zh_CN.properties index ab2e76b332..4e628483c0 100755 --- a/config/alfresco/messages/bootstrap-spaces_zh_CN.properties +++ b/config/alfresco/messages/bootstrap-spaces_zh_CN.properties @@ -9,6 +9,9 @@ spaces.dictionary.description=\u7528\u6237\u7ba1\u7406\u7684\u5b9a\u4e49 spaces.imap_attachments.name=Imap \u7684\u9644\u4ef6 spaces.imap_attachments.description=Imap \u7684\u9644\u4ef6 +spaces.imap_home.name=IMAP \u4e3b\u7a7a\u95f4 +spaces.imap_home.description=IMAP \u4e3b\u7a7a\u95f4 + spaces.imapConfig.name=IMAP \u914d\u7f6e spaces.imapConfig.description=IMAP \u914d\u7f6e diff --git a/config/alfresco/model/modelSchema.xsd b/config/alfresco/model/modelSchema.xsd index 6802f72748..114501baab 100644 --- a/config/alfresco/model/modelSchema.xsd +++ b/config/alfresco/model/modelSchema.xsd @@ -277,8 +277,6 @@ maxOccurs="1" minOccurs="0" /> - diff --git a/config/alfresco/opencmis-context.xml b/config/alfresco/opencmis-context.xml index 2bf702902e..aab15f62bb 100644 --- a/config/alfresco/opencmis-context.xml +++ b/config/alfresco/opencmis-context.xml @@ -40,7 +40,7 @@ - + @@ -66,7 +66,9 @@ - + + + diff --git a/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java b/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java index c7311c8a44..afbbfab2cf 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java +++ b/source/java/org/alfresco/cmis/mapping/CMISPropertyServiceTest.java @@ -26,6 +26,7 @@ import java.util.Map; import org.alfresco.cmis.CMISDictionaryModel; import org.alfresco.cmis.CMISInvalidArgumentException; import org.alfresco.model.ContentModel; +import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.version.VersionModel; import org.alfresco.service.cmr.lock.LockType; import org.alfresco.service.cmr.repository.ContentData; @@ -33,6 +34,8 @@ import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.VersionType; +import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl; +import org.springframework.extensions.webscripts.GUID; public class CMISPropertyServiceTest extends BaseCMISTest { @@ -751,4 +754,24 @@ public class CMISPropertyServiceTest extends BaseCMISTest assertEquals(cmisService.getProperty(folder, CMISDictionaryModel.PROP_NAME.toUpperCase()), "BaseFolder"); assertEquals(cmisService.getProperty(folder, CMISDictionaryModel.PROP_NAME.toLowerCase()), "BaseFolder"); } + + public void testContentMimeTypeDetection() throws Exception + { + // create simple text plain content + NodeRef content = fileFolderService.create(rootNodeRef, "textFile" + GUID.generate(), ContentModel.TYPE_CONTENT).getNodeRef(); + ContentWriter writer = serviceRegistry.getContentService().getWriter(content, ContentModel.PROP_CONTENT, true); + writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); + writer.setEncoding("UTF-8"); + writer.putContent("Simple text plain document"); + + // create content stream with undefined mimetype and file name + ContentStreamImpl contentStreamHTML = new ContentStreamImpl(null, null, " Hello

Test html

"); + String objectId = (String) cmisService.getProperty(content, CMISDictionaryModel.PROP_OBJECT_ID); + + cmisService.setContentStream(objectId, null, true, contentStreamHTML.getStream(), null); + + // check mimetype + String mimetype = (String) cmisService.getProperty(content, CMISDictionaryModel.PROP_CONTENT_STREAM_MIME_TYPE); + assertTrue("Mimetype is not defined correctly.", mimetype.equals(MimetypeMap.MIMETYPE_HTML)); + } } diff --git a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java index 0095f8bb40..d1d101a9df 100644 --- a/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java +++ b/source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java @@ -1971,8 +1971,9 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware, throw new CMISContentAlreadyExistsException(); } - ContentWriter writer = contentService.getWriter(nodeRef, propertyQName, true); + final ContentWriter writer = contentService.getWriter(nodeRef, propertyQName, true); writer.guessEncoding(); + writer.guessMimetype(null); writer.setMimetype(mimeType); writer.putContent(contentStream); diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisStreamInterceptor.java b/source/java/org/alfresco/opencmis/AlfrescoCmisStreamInterceptor.java index 9378130445..a289cb3250 100644 --- a/source/java/org/alfresco/opencmis/AlfrescoCmisStreamInterceptor.java +++ b/source/java/org/alfresco/opencmis/AlfrescoCmisStreamInterceptor.java @@ -26,6 +26,8 @@ import java.util.ArrayList; import java.util.List; import org.alfresco.error.AlfrescoRuntimeException; +import org.alfresco.repo.content.filestore.FileContentReader; +import org.alfresco.service.cmr.repository.MimetypeService; import org.alfresco.util.TempFileProvider; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; @@ -42,6 +44,16 @@ import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl; */ public class AlfrescoCmisStreamInterceptor implements MethodInterceptor { + private MimetypeService mimetypeService; + + /** + * @param mimetypeService service for helping with mimetypes + */ + public void setMimetypeService(MimetypeService mimetypeService) + { + this.mimetypeService = mimetypeService; + } + public Object invoke(MethodInvocation mi) throws Throwable { List reusableContentStreams = null; @@ -61,6 +73,14 @@ public class AlfrescoCmisStreamInterceptor implements MethodInterceptor reusableContentStreams = new ArrayList(); } ReusableContentStream reuableContentStream = new ReusableContentStream(contentStream); + + // ALF-18006 +// if (contentStream.getMimeType() == null) +// { +// String mimeType = mimetypeService.guessMimetype(reuableContentStream.getFileName(), new FileContentReader(reuableContentStream.file)); +// reuableContentStream.setMimeType(mimeType); +// } + reusableContentStreams.add(reuableContentStream); // It is possible to just change the arguments. No need to call a setter. diff --git a/source/java/org/alfresco/opencmis/CMISTest.java b/source/java/org/alfresco/opencmis/CMISTest.java index 7ab41627c6..0237738454 100644 --- a/source/java/org/alfresco/opencmis/CMISTest.java +++ b/source/java/org/alfresco/opencmis/CMISTest.java @@ -13,6 +13,8 @@ import java.util.List; import java.util.Map; import org.alfresco.model.ContentModel; +import org.alfresco.model.WCMModel; +import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.model.Repository; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; @@ -20,6 +22,8 @@ import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileInfo; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; +import org.alfresco.service.namespace.NamespaceService; +import org.alfresco.service.namespace.QName; import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.ApplicationContextHelper; import org.apache.chemistry.opencmis.commons.PropertyIds; @@ -29,7 +33,12 @@ import org.apache.chemistry.opencmis.commons.data.PropertyData; import org.apache.chemistry.opencmis.commons.data.RepositoryInfo; import org.apache.chemistry.opencmis.commons.enums.Action; import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships; +import org.apache.chemistry.opencmis.commons.enums.VersioningState; import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException; +import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl; +import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesImpl; +import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIdImpl; +import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringImpl; import org.apache.chemistry.opencmis.commons.impl.server.AbstractServiceFactory; import org.apache.chemistry.opencmis.commons.server.CallContext; import org.apache.chemistry.opencmis.commons.server.CmisService; @@ -166,6 +175,52 @@ public class CMISTest this.context = new SimpleCallContext("admin", "admin"); } + /** + * ALF-18006 Test content mimetype auto-detection into CmisStreamInterceptor when "Content-Type" is not defined. + */ + @Test + public void testContentMimeTypeDetection() + { + String repositoryId = null; + + CmisService cmisService = factory.getService(context); + try + { + // get repository id + List repositories = cmisService.getRepositoryInfos(null); + assertTrue(repositories.size() > 0); + RepositoryInfo repo = repositories.get(0); + repositoryId = repo.getId(); + + // create content properties + PropertiesImpl properties = new PropertiesImpl(); + String objectTypeId = "cmis:document"; + properties.addProperty(new PropertyIdImpl(PropertyIds.OBJECT_TYPE_ID, objectTypeId)); + String fileName = "textFile" + GUID.generate(); + properties.addProperty(new PropertyStringImpl(PropertyIds.NAME, fileName)); + + // create content stream + ContentStreamImpl contentStream = new ContentStreamImpl(fileName, MimetypeMap.MIMETYPE_TEXT_PLAIN, "Simple text plain document"); + + // create simple text plain content + String objectId = cmisService.create(repositoryId, properties, repositoryHelper.getCompanyHome().toString(), contentStream, VersioningState.MAJOR, null, null); + + Holder objectIdHolder = new Holder(objectId); + + // create content stream with undefined mimetype and file name + ContentStreamImpl contentStreamHTML = new ContentStreamImpl(null, null, " Hello

Test html

"); + cmisService.setContentStream(repositoryId, objectIdHolder, true, null, contentStreamHTML, null); + + // check mimetype + boolean mimetypeHTML = cmisService.getObjectInfo(repositoryId, objectId).getContentType().equals(MimetypeMap.MIMETYPE_HTML); + assertTrue("Mimetype is not defined correctly.", mimetypeHTML); + } + finally + { + cmisService.close(); + } + } + /** * Test for ALF-16310. * diff --git a/source/java/org/alfresco/repo/action/executer/MoveActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MoveActionExecuter.java index 79d2333ec2..7742118565 100644 --- a/source/java/org/alfresco/repo/action/executer/MoveActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/MoveActionExecuter.java @@ -20,6 +20,7 @@ package org.alfresco.repo.action.executer; import java.util.List; +import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ParameterDefinition; @@ -27,11 +28,12 @@ import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.model.FileNotFoundException; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.NodeService; /** - * Copy action executor. + * Move action executor. *

- * Copies the actioned upon node to a specified location. + * Moves the actioned upon node to a specified location. * * @author Roy Wetherall */ @@ -44,12 +46,25 @@ public class MoveActionExecuter extends ActionExecuterAbstractBase * FileFolder service */ private FileFolderService fileFolderService; + + /** + * The node service + */ + private NodeService nodeService; public void setFileFolderService(FileFolderService fileFolderService) { this.fileFolderService = fileFolderService; } + /** + * Sets the node service + */ + public void setNodeService(NodeService nodeService) + { + this.nodeService = nodeService; + } + @Override protected void addParameterDefinitions(List paramList) { @@ -61,14 +76,19 @@ public class MoveActionExecuter extends ActionExecuterAbstractBase */ public void executeImpl(Action ruleAction, NodeRef actionedUponNodeRef) { - NodeRef destinationParent = (NodeRef)ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER); - try + // ALF-17635: A move action should not fire on a working copy - wait until check in + if (this.nodeService.exists(actionedUponNodeRef) + && !this.nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY)) { - fileFolderService.move(actionedUponNodeRef, destinationParent, null); - } - catch (FileNotFoundException e) - { - // Do nothing + NodeRef destinationParent = (NodeRef) ruleAction.getParameterValue(PARAM_DESTINATION_FOLDER); + try + { + fileFolderService.move(actionedUponNodeRef, destinationParent, null); + } + catch (FileNotFoundException e) + { + // Do nothing + } } } diff --git a/source/java/org/alfresco/repo/calendar/CalendarServiceImplTest.java b/source/java/org/alfresco/repo/calendar/CalendarServiceImplTest.java index 36161b39b6..fee933cbab 100644 --- a/source/java/org/alfresco/repo/calendar/CalendarServiceImplTest.java +++ b/source/java/org/alfresco/repo/calendar/CalendarServiceImplTest.java @@ -117,7 +117,7 @@ public class CalendarServiceImplTest PERSON_SERVICE = (PersonService)testContext.getBean("personService"); TRANSACTION_HELPER = (RetryingTransactionHelper)testContext.getBean("retryingTransactionHelper"); PERMISSION_SERVICE = (PermissionService)testContext.getBean("permissionService"); - SITE_SERVICE = (SiteService)testContext.getBean("siteService"); + SITE_SERVICE = (SiteService)testContext.getBean("SiteService"); TAGGING_SERVICE = (TaggingService)testContext.getBean("TaggingService"); // Get the canned query registry, and from that the factory diff --git a/source/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java b/source/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java index 434b35e019..e582226450 100644 --- a/source/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java +++ b/source/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java @@ -123,7 +123,7 @@ public class DiscussionServiceImplTest PERSON_SERVICE = (PersonService)testContext.getBean("personService"); TRANSACTION_HELPER = (RetryingTransactionHelper)testContext.getBean("retryingTransactionHelper"); PERMISSION_SERVICE = (PermissionService)testContext.getBean("permissionService"); - SITE_SERVICE = (SiteService)testContext.getBean("siteService"); + SITE_SERVICE = (SiteService)testContext.getBean("SiteService"); TAGGING_SERVICE = (TaggingService)testContext.getBean("TaggingService"); TENANT_ADMIN_SERVICE = testContext.getBean("tenantAdminService", TenantAdminService.class); diff --git a/source/java/org/alfresco/repo/importer/ImporterComponent.java b/source/java/org/alfresco/repo/importer/ImporterComponent.java index 9478fab33d..cf0458da95 100644 --- a/source/java/org/alfresco/repo/importer/ImporterComponent.java +++ b/source/java/org/alfresco/repo/importer/ImporterComponent.java @@ -937,7 +937,8 @@ public class ImporterComponent { childName = bindPlaceHolder(childName, binding); // - if (ContentModel.TYPE_PERSON.equals(context.getTypeDefinition().getName())) + if (ContentModel.TYPE_PERSON.equals(context.getTypeDefinition().getName()) + && assocType.equals(ContentModel.ASSOC_CHILDREN)) { childName = childName.toLowerCase(); }