Reverse merged V2.2.1.x

<<< Need to use a different approach. >>>
         Merged DEV to V2.2.1.x
            114241: MNT-14900 : Alfresco doesn't work with Records Management
               - Fixed problem with circular references during Spring dependency injection process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2.1.x@114605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Balmus
2015-10-16 14:14:03 +00:00
parent 670ca476a4
commit dbbe428c37
4 changed files with 7 additions and 41 deletions

View File

@@ -145,8 +145,7 @@
<!-- Action Service -->
<bean id="actionService" class="org.alfresco.repo.action.ExtendedActionServiceImpl" init-method="init">
<!-- The following reference injection has been commented out to address MNT-14900; dependency is resolved internally. -->
<!-- <property name="filePlanService" ref="FilePlanService" /> -->
<property name="filePlanService" ref="FilePlanService" />
<property name="policyComponent">
<ref bean="policyComponent" />

View File

@@ -501,8 +501,7 @@
<property name="authorityService" ref="AuthorityService"/>
<property name="permissionService" ref="PermissionService"/>
<property name="nodeService" ref="NodeService"/>
<!-- The following reference injection has been commented out to address MNT-14900; dependency is resolved internally. -->
<!-- <property name="filePlanService" ref="FilePlanService" /> -->
<property name="filePlanService" ref="FilePlanService" />
<!-- init repo for when a tenant is created -->
<property name="bootstrapImporterModuleComponent" ref="org_alfresco_module_rm_bootstrapData"/>