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

ALF-2620: Fixed problem with the paths being used in rendition path template model. "cwd" is now a file/display path and "companyHome" is a TemplateNode.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2010-04-28 15:58:18 +00:00
parent 8bf1c1042c
commit aa06314b72
6 changed files with 86 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverTest.java
View File

@@ -145,13 +145,14 @@ public class StandardRenditionLocationResolverTest extends BaseAlfrescoSpringTes
assertTrue("Folder " + fooPath + " should not exist!", childAssocs.isEmpty());
QName renditionKind = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "test");
NodeRef sourceNode = makeNode(companyHome, ContentModel.TYPE_CONTENT);
NodeRef sourceFolder = makeNode(companyHome, ContentModel.TYPE_FOLDER);
NodeRef sourceNode = makeNode(sourceFolder, ContentModel.TYPE_CONTENT);
NodeRef tempRenditionNode = makeNode(companyHome, ContentModel.TYPE_CONTENT);
RenditionDefinition renditionDef = renditionService.createRenditionDefinition(renditionKind,
"nicks_test_engine");
String pathTemplate = barPath + "/nick.xml";
String pathTemplate = barPath + "${cwd}nick.xml";
renditionDef.setParameterValue(RenditionService.PARAM_DESTINATION_PATH_TEMPLATE, pathTemplate);
RenditionLocation location =
@@ -159,8 +160,9 @@ public class StandardRenditionLocationResolverTest extends BaseAlfrescoSpringTes
NodeRef fooNode = checkFolder(fooName, companyHome, "Foo");
NodeRef barNode = checkFolder(barName, fooNode, "Bar");
NodeRef finalFolderNode = checkFolder(nodeService.getPrimaryParent(sourceFolder).getQName(), barNode, "Final Folder");
assertEquals("Bar is not the rendition parent!", barNode, location.getParentRef());
assertEquals("Final folder is not the rendition parent!", finalFolderNode, location.getParentRef());
assertEquals("nick.xml", location.getChildName());
}
@@ -202,7 +204,7 @@ public class StandardRenditionLocationResolverTest extends BaseAlfrescoSpringTes
Map<QName, Serializable> props = new HashMap<QName, Serializable>();
props.put(ContentModel.PROP_NAME, uuid);
ChildAssociationRef assoc = nodeService.createNode(parent, ContentModel.ASSOC_CONTAINS, QName.createQName(
NamespaceService.APP_MODEL_1_0_URI, uuid), nodeType, props);
NamespaceService.CONTENT_MODEL_1_0_URI, uuid), nodeType, props);
return assoc.getChildRef();
}