7 Commits

Author SHA1 Message Date
Neil McErlean
338c43af0c Merge from V3.4 to HEAD
r.24479 Merge from V3.3-BUG-FIX to V3.4
  r.24478 Merge from V3.3 to V3.3-BUG-FIX
  r.24477 Fix for ALF-6130. infinite recursion in RenditionServiceImpl.loadRenditionDefinitions(String) 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-01-17 08:41:30 +00:00
Neil McErlean
244fbe1460 Merge from V3.4 to HEAD. Fix for ALF-6192.
r24622 Fix for ALF-6192 alfresco share could not delete file with preview.
      This issue was ultimately caused by the incorrect use of a BeforeDeleteNode policy.
      As a workaround to ALF-4119 a beforeDeleteNode policy was defined in RenditionAspect.java.
      This policy ensured that when path/template-based renditions were deleted, that the parent-child
      association to the source node, which is a non-primary association, was removed. In doing so, future
      calls to renditionService.getRenditions() would not return renditions from the archive store.

      However, this led to the permissions problem observed in this issue.

      It is possible that running the BeforeDeleteNode policy as system could have resolved the problem.
      However an alternative workaround for the deleted renditions problem has been implemented.
      The policy has been removed and instead, the RenditionService filters the results.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-01-05 14:16:59 +00:00
Neil McErlean
d1db3663e4 Fix for ALF-5373 Renditions being generated to the same location (e.g. through use of paths/templates) can lead to incorrect renditions/exceptions.
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
2010-10-28 21:00:32 +00:00
Neil McErlean
3b6c819013 Rendition Definitions as native actions.
- PerformRenditionActionExecuter class and perform-rendition bean have been deprecated.
   These constituted a containing action which the RenditionService wrapped around every rendition definition.
   Their internals have been pushed down into AbstractRenderingEngine which should allow rendition definitions
   (which are actions) to be used as first-class action beans. What remains should be backwards compatible, but is
   now unnecessary.
 - Temporarily switched off some Mockito-based unit tests which need updating. Will chat to Nick tomorrow.
 - New action param: is-component-rendition : used to identify components renditions within a composite.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-05 15:35:44 +00:00
Neil McErlean
cafa116c74 Javadoc improvements and private variable renaming in the rendition service.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-14 10:41:13 +00:00
Neil McErlean
8e9c4f3aa5 RenditionService JS API.
Support for creating a RenditionDefinition from within JavaScript
Support for executing such an ad hoc rendition definition.
ScriptRendtionService now accepts long-form or short-form QNames where applicable.
Replaced "rendering actions" with "rendition definitions" in some javadoc and some private or local variable names.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-12 21:28:38 +00:00
Neil McErlean
bce28a5599 Merging DEV_TEMPORARY to HEAD (RenditionService)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-05 20:02:52 +00:00