inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for ALF-3733 (Rendition API - destination-path-template fails to create association)

Browse Source 
The fix was primarily to ensure that templated paths with elements that resolved to empty strings, did not lead to the creation of illegal paths in the FileFolderService. An example would be //foo/bar.
  Added a Java test case that reproduced the issue.
  Added a JavaScript test case that partially reproduced the issue.
  Also needed to add extract method in ScriptAction to allow some internal code to be called by subclasses. This had the serendipitous benefit of reducing repeated code. This was a secondary issue whereby parameters set in the renditionDefinition were not being correctly passed from the Script layer to the Java layer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22099 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2010-08-31 16:44:11 +00:00
parent d0fa96a05e
commit 8de08f878f
6 changed files with 100 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverImpl.java
View File

@@ -28,12 +28,12 @@ import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.model.filefolder.FileFolderServiceImpl;
import org.alfresco.repo.rendition.executer.AbstractRenderingEngine;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.template.TemplateNode;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileFolderUtil;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.rendition.RenditionDefinition;
@@ -75,12 +75,7 @@ public class StandardRenditionLocationResolverImpl implements RenditionLocationR
/*
* (non-Javadoc)
*
* @seeorg.alfresco.repo.rendition.RenditionLocationResolver#
* resolveRenditionPrimaryParentAssoc
* (org.alfresco.service.cmr.repository.NodeRef,
* org.alfresco.service.cmr.rendition.RenditionDefinition,
* org.alfresco.service.cmr.repository.ChildAssociationRef)
* @see org.alfresco.repo.rendition.RenditionLocationResolver#getRenditionLocation(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.rendition.RenditionDefinition, org.alfresco.service.cmr.repository.NodeRef)
*/
public RenditionLocation getRenditionLocation(NodeRef sourceNode, RenditionDefinition definition, NodeRef tempRenditionLocation)
{
@@ -126,12 +121,12 @@ public class StandardRenditionLocationResolverImpl implements RenditionLocationR
List<String> pathElements = Arrays.asList(path.split("/"));
LinkedList<String> folderElements = new LinkedList<String>(pathElements);
// We need to strip out any empty strings within the path elements.
// prior to passing this path to the fileFolderService for creation.
// e.g. "//foo//bar///item.txt" would cause an exception.
folderElements.removeAll(Arrays.asList(new String[]{""}));
// Remove empty folder caused by path starting with / .
if(folderElements.getFirst().length() == 0)
{
folderElements.removeFirst();
}
// Remove 'Company Home' if it is at the start of the path.
Serializable companyHomeName = nodeService.getProperty(companyHome, ContentModel.PROP_NAME);
if(folderElements.getFirst().equals(companyHomeName))
@@ -149,7 +144,7 @@ public class StandardRenditionLocationResolverImpl implements RenditionLocationR
NodeRef parent = companyHome;
if (!folderElements.isEmpty())
{
FileInfo parentInfo = FileFolderServiceImpl.makeFolders(fileFolderService,
FileInfo parentInfo = FileFolderUtil.makeFolders(fileFolderService,
companyHome, folderElements,
ContentModel.TYPE_FOLDER);
parent = parentInfo.getNodeRef();