In the HTML rendering engine, when extracting out images, don't include WCM specific associations. (We'll put back some more general ones once composite content hopefully offers a suitable one)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2010-09-28 10:46:20 +00:00
parent 778078e26c
commit 798e35c455
4 changed files with 27 additions and 46 deletions

View File

@@ -93,17 +93,6 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
*/
public static final String NAME = "htmlRenderingEngine";
protected static final QName PRIMARY_IMAGE = QName.createQName(
"http://www.alfresco.org/model/website/1.0", "primaryImage");
protected static final QName SECONDARY_IMAGE = QName.createQName(
"http://www.alfresco.org/model/website/1.0", "secondaryImage");
private DictionaryService dictionaryService;
public void setDictionaryService(DictionaryService dictionaryService) {
this.dictionaryService = dictionaryService;
}
@Override
protected Collection<ParameterDefinition> getParameterDefinitions() {
@@ -219,19 +208,9 @@ public class HTMLRenderingEngine extends AbstractRenderingEngine
).getChildRef();
}
// If we can, associate it with the rendered HTML, so
// that they're properly linked
QName assocType = SECONDARY_IMAGE;
if(primary)
{
assocType = PRIMARY_IMAGE;
}
if(dictionaryService.getAssociation(assocType) != null)
{
nodeService.createAssociation(
context.getDestinationNode(), img, assocType
);
}
// TODO Once composite content is properly supported,
// at this point we'll associate the new image with
// the rendered HTML node so the dependency is tracked.
// Put the image into the node
ContentWriter writer = contentService.getWriter(