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-5373 Renditions being generated to the same location (e.g. through use of paths/templates) can lead to incorrect renditions/exceptions.

Browse Source 
Added new policy to aspect rn:rendition. Rendition nodes, before deletion, have their non-primary parent assocs removed.  Otherwise the deletion of rendition nodes (which just moves them to the archive store) means that renditionService.getRenditions() returns those deleted assocs.
     Enabled HTMLRenderingEngineTest.testImagesSameFolder test case. Changed it slightly so that it deletes renditions/extracted images between test runs to prevent unwanted overwriting of renditions
     Enabled RenditionServiceIntegrationTest.testRenditionPlacements test case. Fixed the test path to point to /.../filename.txt as it should.
           Rewrote the end of the test to cover the cases where a rendition is attempting to overwrite another.
     Refactoring: renamed numerous private variables to aid readability
     Changes to RenditionNodeManager. If:
           a rendition is to an existing node that is not a rendition OR
           a rendition is to an existing rendition node whose source is not the same as the current one OR
           a rendition is to an existing rendition node whose renditionDef's name has changed
     Then throw an exception. We explicitly disallow these use cases now. We may support them in the future with a "forceOverwrite" option somewhere.
     StandardRenditionLocationResolverImpl now uses a RepositoryHelper to locate CompanyHome rather than a Lucene search
     Extensive debug logging added to the service.
     Added some javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2010-10-28 21:00:32 +00:00
parent f1d8da31b7
commit d1db3663e4
14 changed files with 375 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1741,7 +1741,7 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
* renditions, both single and composite, to check that
* the renditions always end up as they should do.
*/
public void DISABLEDtestRenditionPlacements() throws Exception
public void testRenditionPlacements() throws Exception
{
QName plainQName = QName.createQName("Plain");
RenditionDefinition rdPlain = renditionService.createRenditionDefinition(
@@ -1850,7 +1850,8 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
String path = "/" +
(String) nodeService.getProperty(repositoryHelper.getCompanyHome(), ContentModel.PROP_NAME) +
"/" +
(String) nodeService.getProperty(testTargetFolder, ContentModel.PROP_NAME)
(String) nodeService.getProperty(testTargetFolder, ContentModel.PROP_NAME) +
"/" + "HelloWorld.txt";
;
rdPlain.setParameterValue(
@@ -1873,14 +1874,15 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
// Do a plain rendition, and check we acquired the one node
renditionService.render(nodeWithDocContent, rdPlain);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(nodeWithDocContent).size());
assertTrue(nodeService.getChildAssocs(nodeWithDocContent).get(0).isPrimary() == false);
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
assertEquals(plainQName, nodeService.getChildAssocs(testTargetFolder).get(0).getQName());
// Tidy
nodeService.deleteNode(
renditionService.getRenditions(nodeWithDocContent).get(0).getChildRef()
);
assertNotNull(nodeWithDocContent);
assertEquals(0, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
@@ -1891,7 +1893,7 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
// nodes created during the composite stage
renditionService.render(nodeWithDocContent, rdComposite);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
assertEquals(compositeQName, nodeService.getChildAssocs(testTargetFolder).get(0).getQName());
@@ -1908,14 +1910,14 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
// Create one of the right type for a plain rendition
renditionService.render(nodeWithDocContent, rdPlain);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
// Run again, shouldn't change, should re-use the node
renditionNode = nodeService.getChildAssocs(testTargetFolder).get(0).getChildRef();
renditionService.render(nodeWithDocContent, rdPlain);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
assertEquals(renditionNode, nodeService.getChildAssocs(testTargetFolder).get(0).getChildRef());
assertEquals(plainQName, nodeService.getChildAssocs(testTargetFolder).get(0).getQName());
@@ -1927,14 +1929,14 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
);
renditionService.render(nodeWithDocContent, rdComposite);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
// Run again, shouldn't change, should re-use the node
renditionNode = nodeService.getChildAssocs(testTargetFolder).get(0).getChildRef();
renditionService.render(nodeWithDocContent, rdComposite);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
assertEquals(renditionNode, nodeService.getChildAssocs(testTargetFolder).get(0).getChildRef());
assertEquals(compositeQName, nodeService.getChildAssocs(testTargetFolder).get(0).getQName());
@@ -1950,24 +1952,21 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
// Run the plain rendition, the composite one should be replaced
// with the new one
renditionNode = nodeService.getChildAssocs(testTargetFolder).get(0).getChildRef();
// Currently, there is only one scenario in which it is legal for a rendition to overwrite an existing
// node. That is when the rendition is an update of the source node i.e. the rendition node is already
// linked to its source node by a rn:rendition association of the same name as the new rendition.
boolean exceptionThrown = false;
try
{
renditionService.render(nodeWithDocContent, rdPlain);
} catch (RenditionServiceException expected)
{
exceptionThrown = true;
}
renditionService.render(nodeWithDocContent, rdPlain);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
assertNotSame(renditionNode, nodeService.getChildAssocs(testTargetFolder).get(0).getChildRef());
assertEquals(plainQName, nodeService.getChildAssocs(testTargetFolder).get(0).getQName());
// We now have a plain one, so run the composite one and see
// it get replaced again
renditionNode = nodeService.getChildAssocs(testTargetFolder).get(0).getChildRef();
renditionService.render(nodeWithDocContent, rdComposite);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
assertNotSame(renditionNode, nodeService.getChildAssocs(testTargetFolder).get(0).getChildRef());
assertEquals(compositeQName, nodeService.getChildAssocs(testTargetFolder).get(0).getQName());
assertTrue("Expected RenditionServiceException not thrown", exceptionThrown);
}
@@ -2152,10 +2151,9 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
@Override
protected void render(RenderingContext context) {
System.err.print("Rendering " + context.getSourceNode() + " to " + context.getDestinationNode());
ContentWriter contentWriter = context.makeContentWriter();
contentWriter.setMimetype("text/plain");
contentWriter.putContent( "Hello, world!" );
ContentWriter contentWriter = context.makeContentWriter();
contentWriter.setMimetype("text/plain");
contentWriter.putContent( "Hello, world!" );
}
}
}