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@114437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/config/alfresco/module/org_alfresco_module_rm/extended-repository-context.xml

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

rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml

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

rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java

@@ -53,6 +53,9 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
@@ -62,7 +65,8 @@ import org.springframework.extensions.surf.util.I18NUtil;
  * @since 2.1
  */
 public class FilePlanRoleServiceImpl implements FilePlanRoleService,
-                                                RecordsManagementModel
+                                                RecordsManagementModel,
+                                                ApplicationContextAware
 {
     /** I18N */
     private static final String MSG_ALL_ROLES = "rm.role.all";
@@ -93,6 +97,8 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
 
     private BootstrapImporterModuleComponent bootstrapImporterModule;
 
+    private ApplicationContext applicationContext;
+
     /** Records management role zone */
     public static final String RM_ROLE_ZONE_PREFIX = "rmRoleZone";
 
@@ -148,6 +154,16 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
         this.bootstrapImporterModule = bootstrapImporterModuleComponent;
     }
     
+    protected FilePlanService getFilePlanService()
+    {
+        if (filePlanService == null)
+        {
+            filePlanService = (FilePlanService) applicationContext.getBean("FilePlanService");
+        }
+
+        return filePlanService;
+    }
+
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService#initialiseFilePlan(org.alfresco.service.cmr.repository.NodeRef)
      */
@@ -190,11 +206,11 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
                     permissionService.setPermission(filePlan, ExtendedWriterDynamicAuthority.EXTENDED_WRITER, RMPermissionModel.FILING, true);
 
                     // Create the transfer and hold containers
-                    systemContainers.add(filePlanService.createHoldContainer(filePlan));
+                    systemContainers.add(getFilePlanService().createHoldContainer(filePlan));
-                    systemContainers.add(filePlanService.createTransferContainer(filePlan));
+                    systemContainers.add(getFilePlanService().createTransferContainer(filePlan));
 
                     // Create the unfiled record container
-                    systemContainers.add(filePlanService.createUnfiledContainer(filePlan));
+                    systemContainers.add(getFilePlanService().createUnfiledContainer(filePlan));
 
                     return systemContainers;
                 }
@@ -877,4 +893,10 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
     {
         return authorityService.getName(AuthorityType.GROUP, getAllRolesGroupShortName(filePlan));
     }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.applicationContext = applicationContext;
+    }
 }

rm-server/source/java/org/alfresco/repo/action/ExtendedActionServiceImpl.java

@@ -46,6 +46,16 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
     /** Application context */
     private ApplicationContext extendedApplicationContext;
 
+    protected FilePlanService getFilePlanService()
+    {
+        if (filePlanService == null)
+        {
+            filePlanService = (FilePlanService) extendedApplicationContext.getBean("FilePlanService");
+        }
+
+        return filePlanService;
+    }
+    
     /**
      * @see org.alfresco.repo.action.ActionServiceImpl#setApplicationContext(org.springframework.context.ApplicationContext)
      */
@@ -98,7 +108,7 @@ public class ExtendedActionServiceImpl extends ActionServiceImpl implements Appl
         else
         {
             // get the file component kind of the node reference
-            FilePlanComponentKind kind = filePlanService.getFilePlanComponentKind(nodeRef);
+            FilePlanComponentKind kind = getFilePlanService().getFilePlanComponentKind(nodeRef);
             result = new ArrayList<ActionDefinition>(actionDefinitions.size());
 
             // check each action definition