Merge remote-tracking branch 'remotes/origin/release/V2.7.2.x' into merge-2.7/MNT-20741_AddingSubtypeLogic

This commit is contained in:
cagache
2019-07-17 09:50:40 +03:00
2 changed files with 2 additions and 18 deletions

View File

@@ -248,9 +248,8 @@
</property>
</bean>
<bean name="contentBinDuplicationUtility" class="org.alfresco.module.org_alfresco_module_rm.util.ContentBinDuplicationUtility">
<bean name="contentBinDuplicationUtility" class="org.alfresco.module.org_alfresco_module_rm.util.ContentBinDuplicationUtility" parent="baseService">
<property name="behaviourFilter" ref="policyBehaviourFilter"/>
<property name="contentService" ref="contentService"/>
</bean>
<!-- Prevent ghosted records being renditioned -->

View File

@@ -29,7 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.util;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -38,7 +37,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
* @author Ross Gale
* @since 2.7.2
*/
public class ContentBinDuplicationUtility
public class ContentBinDuplicationUtility extends ServiceBaseImpl
{
/**
@@ -46,11 +45,6 @@ public class ContentBinDuplicationUtility
*/
private BehaviourFilter behaviourFilter;
/**
* Provides methods for accessing and transforming content.
*/
private ContentService contentService;
/**
* Setter for behaviour filter
* @param behaviourFilter BehaviourFilter
@@ -60,15 +54,6 @@ public class ContentBinDuplicationUtility
this.behaviourFilter = behaviourFilter;
}
/**
* Setter for content service
* @param contentService ContentService
*/
public void setContentService(ContentService contentService)
{
this.contentService = contentService;
}
/**
* Duplicate the content of a node without triggering the audit or versioning behaviours
*