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

Merge from V3.4 to HEAD. Fix for ALF-6192.

Browse Source 
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
This commit is contained in:
Neil McErlean
2011-01-05 14:16:59 +00:00
parent d1b87163b6
commit 244fbe1460
4 changed files with 33 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/rendition-services-context.xml
View File

@@ -169,11 +169,6 @@
<property name="renditionService" ref="RenditionService"/>
</bean>
<bean id="renditionAspect" class="org.alfresco.repo.rendition.RenditionAspect" init-method="init">
<property name="nodeService" ref="NodeService"/>
<property name="policyComponent" ref="policyComponent"/>
</bean>
<!-- JavaScript API support -->
<bean id="renditionServiceScript" parent="baseJavaScriptExtension"
class="org.alfresco.repo.rendition.script.ScriptRenditionService">

116
source/java/org/alfresco/repo/rendition/RenditionAspect.java
View File

@@ -1,116 +0,0 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.rendition;
import java.util.List;
import org.alfresco.model.RenditionModel;
import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.policy.Behaviour;
import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Rendition aspect behaviour bean.
* <p/>
* When any rendition node is deleted, its parent association back to the source
* node must be predeleted also. Otherwise a child-association remains from the
* source node to the rendition node in the archive store.
*
* @author Neil McErlean
* @since 3.4
*/
public class RenditionAspect implements NodeServicePolicies.BeforeDeleteNodePolicy
{
/** logger */
private static final Log log = LogFactory.getLog(RenditionAspect.class);
/** Services */
private PolicyComponent policyComponent;
private NodeService nodeService;
/**
* Set the policy component
*
* @param policyComponent policy component
*/
public void setPolicyComponent(PolicyComponent policyComponent)
{
this.policyComponent = policyComponent;
}
/**
* Set the node service
*
* @param nodeService node service
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/**
* Initialise method
*/
public void init()
{
this.policyComponent.bindClassBehaviour(
QName.createQName(NamespaceService.ALFRESCO_URI, "beforeDeleteNode"),
RenditionModel.ASPECT_RENDITION,
new JavaBehaviour(this, "beforeDeleteNode", Behaviour.NotificationFrequency.EVERY_EVENT));
}
@Override
public void beforeDeleteNode(NodeRef nodeRef)
{
if (!nodeService.exists(nodeRef))
{
return;
}
if (log.isDebugEnabled())
{
log.debug("Predeleting rendition assoc to " + nodeRef);
}
List<ChildAssociationRef> parents = nodeService.getParentAssocs(nodeRef, RenditionModel.ASSOC_RENDITION, RegexQNamePattern.MATCH_ALL);
// There should in fact only be one parent of type rn:rendition to a rendition node.
final int parentCount = parents.size();
if (parents.size() > 1 && log.isDebugEnabled())
{
log.debug("Unexpectedly found " + parentCount + " source nodes. Removing all parent assocs.");
}
for (ChildAssociationRef chAssRef : parents)
{
// Initially only for non-primary child-associations
if (chAssRef.isPrimary() == false)
{
nodeService.removeChildAssociation(chAssRef);
}
}
}
}

24
source/java/org/alfresco/repo/rendition/RenditionServiceImpl.java
View File

@@ -43,6 +43,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.GUID;
@@ -292,10 +293,30 @@ public class RenditionServiceImpl implements RenditionService, RenditionDefiniti
{
// Get all the renditions that match the given rendition name
result = nodeService.getChildAssocs(node, RenditionModel.ASSOC_RENDITION, RegexQNamePattern.MATCH_ALL);
result = removeArchivedRenditionsFrom(result);
}
return result;
}
private List<ChildAssociationRef> removeArchivedRenditionsFrom(List<ChildAssociationRef> renditionAssocs)
{
// This is a workaround for a bug in the NodeService (no JIRA number yet) whereby a call to
// nodeService.getChildAssocs can return all children, including children in the archive store.
List<ChildAssociationRef> result = new ArrayList<ChildAssociationRef>();
for (ChildAssociationRef chAssRef : renditionAssocs)
{
// If the rendition has *not* been deleted, then it should remain in the result list.
if (chAssRef.getChildRef().getStoreRef().equals(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE) == false)
{
result.add(chAssRef);
}
}
return result;
}
/*
* (non-Javadoc)
* @see
@@ -330,6 +351,8 @@ public class RenditionServiceImpl implements RenditionService, RenditionDefiniti
}
}
filteredResults = removeArchivedRenditionsFrom(filteredResults);
return filteredResults;
}
@@ -347,6 +370,7 @@ public class RenditionServiceImpl implements RenditionService, RenditionDefiniti
// Get all the renditions that match the given rendition name -
// there should only be 1 (or 0)
renditions = this.nodeService.getChildAssocs(node, RenditionModel.ASSOC_RENDITION, renditionName);
renditions = this.removeArchivedRenditionsFrom(renditions);
}
if (renditions.isEmpty())
{

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

@@ -1885,7 +1885,10 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
assertNotNull(nodeWithDocContent);
assertEquals(0, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
// FIXME There is a bug in the NodeService whereby associations to children in the archive store
// i.e. deleted children, are included in the results to the getChildAssocs call.
// Therefore, pending a fix to that, we need to suppress this check and similar checks below.
//assertEquals(0, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(0, nodeService.getChildAssocs(testTargetFolder).size());
// Now do a composite rendition
@@ -1893,7 +1896,7 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
// nodes created during the composite stage
renditionService.render(nodeWithDocContent, rdComposite);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(nodeWithDocContent).size());
//assertEquals(1, nodeService.getChildAssocs(nodeWithDocContent).size());
assertEquals(1, nodeService.getChildAssocs(testTargetFolder).size());
assertEquals(compositeQName, nodeService.getChildAssocs(testTargetFolder).get(0).getQName());
@@ -1910,14 +1913,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(1, 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(1, 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());
@@ -1929,14 +1932,14 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
);
renditionService.render(nodeWithDocContent, rdComposite);
assertEquals(1, renditionService.getRenditions(nodeWithDocContent).size());
assertEquals(1, 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(1, 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());