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

44
source/java/org/alfresco/repo/rendition/RenditionServiceIntegrationTest.java
View File

@@ -1664,6 +1664,50 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
assertEquals(MimetypeMap.MIMETYPE_IMAGE_PNG, avatarRenditionDef.getParameterValue(AbstractRenderingEngine.PARAM_MIME_TYPE));
}
public void testALF3733() throws Exception
{
// ALF-3733 was caused by ${cwd} evaluating to the empty string and a path "//sourceNodeName"
// being passed to the FileFolderService for creation. This then splits the string using '/' as
// a delimiter which leads to the attempted creation of nodes with the empty string as a name,
// which is illegal.
QName renditionDefName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "myDummyRendition");
String renderingEngineName = "imageRenderingEngine";
RenditionDefinition renditionDef = renditionService.createRenditionDefinition(renditionDefName, renderingEngineName);
Map<String, Serializable> params = new HashMap<String, Serializable>();
params.put(ImageRenderingEngine.PARAM_RESIZE_WIDTH, 99);
params.put(ImageRenderingEngine.PARAM_RESIZE_HEIGHT, 99);
params.put(RenditionService.PARAM_DESTINATION_PATH_TEMPLATE, "${cwd}/resized/${name}_Thumb.${extension}");
renditionDef.addParameterValues(params);
ChildAssociationRef rendition = renditionService.render(this.nodeWithImageContent, renditionDef);
assertNotNull("rendition was null.", rendition);
assertTrue(nodeService.hasAspect(rendition.getChildRef(), RenditionModel.ASPECT_VISIBLE_RENDITION));
// The rendition should have 2 parents.
List<ChildAssociationRef> allParents = nodeService.getParentAssocs(rendition.getChildRef());
assertEquals(2, allParents.size());
// The rendition should be created under a new folder called 'resized'
NodeRef primaryParent = nodeService.getPrimaryParent(rendition.getChildRef()).getParentRef();
assertEquals("resized", nodeService.getProperty(primaryParent, ContentModel.PROP_NAME));
assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(primaryParent));
// The rendition should have the source node as a non-primary parent.
NodeRef nonPrimaryParent = null;
for (ChildAssociationRef chAss : allParents)
{
if (! chAss.getParentRef().equals(primaryParent))
{
nonPrimaryParent = chAss.getParentRef();
}
}
assertNotNull("Non-primary parent was not found.", nonPrimaryParent);
assertEquals(nodeWithImageContent, nonPrimaryParent);
}
private RenditionDefinition loadAndValidateRenditionDefinition(String renditionLocalName)
{
QName renditionQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, renditionLocalName);