Merge branch 'feature-2.4/RM-3216_RegressionIMAP' into 'release/V2.4'

Feature 2.4/rm 3216 regression imap

RM-3274 - Error creating bean with name 'imapServiceBootstrap'

I added an invalid authentication util bean reference to the extended IMAP service and the setter was missing.

See merge request !117
This commit is contained in:
Ana Bozianu
2016-04-13 07:30:16 +01:00
2 changed files with 8 additions and 1 deletions

View File

@@ -6,7 +6,7 @@
<!-- Extend Imap Service --> <!-- Extend Imap Service -->
<bean id="rm.imapService" abstract="true" class="org.alfresco.repo.imap.ExtendedImapServiceImpl"> <bean id="rm.imapService" abstract="true" class="org.alfresco.repo.imap.ExtendedImapServiceImpl">
<property name="dictionaryService" ref="DictionaryService"/> <property name="dictionaryService" ref="DictionaryService"/>
<property name="authenticationUtil" ref="AuthenticationUtil"/> <property name="authenticationUtil" ref="rm.authenticationUtil"/>
</bean> </bean>
<bean class="org.alfresco.util.BeanExtender"> <bean class="org.alfresco.util.BeanExtender">
<property name="beanName" value="imapService" /> <property name="beanName" value="imapService" />

View File

@@ -54,12 +54,19 @@ public class ExtendedImapServiceImpl extends ImapServiceImpl
this.dictionaryService = dictionaryService; this.dictionaryService = dictionaryService;
} }
public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
{
this.authenticationUtil = authenticationUtil;
}
@Override
public void setPolicyFilter(BehaviourFilter policyBehaviourFilter) public void setPolicyFilter(BehaviourFilter policyBehaviourFilter)
{ {
this.policyBehaviourFilter = policyBehaviourFilter; this.policyBehaviourFilter = policyBehaviourFilter;
super.setPolicyFilter(policyBehaviourFilter); super.setPolicyFilter(policyBehaviourFilter);
} }
@Override
public void setNodeService(NodeService nodeService) public void setNodeService(NodeService nodeService)
{ {
this.nodeService = nodeService; this.nodeService = nodeService;