RM-572 - Refactor: Filling action logic moved to Record Service

* file and setup folder action removed in favour of services
  * disposition action methods consolidated in disposition service
  * vital record action methods consolidated in vital record service
  * unit test updates
  * other code fallout



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@44783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml

@@ -254,7 +254,8 @@
             <aspect>cm:titled</aspect>
             <aspect>rma:recordComponentIdentifier</aspect>
             <aspect>rma:commonRecordDetails</aspect>
-            <aspect>rma:filePlanComponent</aspect>
+            <aspect>rma:filePlanComponent</aspect>            
+        <!-- <aspect>rma:vitalRecordDefinition</aspect> -->
          </mandatory-aspects>
 
       </type>

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

@@ -64,34 +64,6 @@
         
     </bean>
 
-    <!-- file action -->
-    <!-- Bound to policy: allow -->
-
-    
-    <bean id="file_proxy" parent="rmProxyAction">
-        <property name="target">
-            <ref bean="file"/>
-        </property>
-        <property name="interceptorNames">
-            <list>
-                <idref bean="file_security"/>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="file_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor" parent="actionSecurity">
-        <property name="objectDefinitionSource">
-            <value>
-                   org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.execute=RM_ALLOW
-                   org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.*=RM_ALLOW
-                   org.alfresco.repo.action.executer.ActionExecuter.*=RM_ALLOW
-            </value>
-        </property>
-    </bean>
-    
-    <!-- disable normal registration - the proxy will do it so the proxy is registered -->
-    <bean id="file" class="org.alfresco.module.org_alfresco_module_rm.action.impl.FileAction" parent="rmAction" />
-
     <!-- Cutoff action -->
     
     
@@ -278,32 +250,6 @@
     
     <bean id="reviewed" class="org.alfresco.module.org_alfresco_module_rm.vital.ReviewedAction" parent="rmAction" depends-on="rmCycleVitalRecordsCapability" />    
     
-    <!-- set up record folder -->
-    <!-- bound to policy: allow -->
-    
-    <bean id="setupRecordFolder_proxy" class="org.alfresco.module.org_alfresco_module_rm.capability.RMActionProxyFactoryBean" parent="rmProxyAction" init-method="registerAction">
-        <property name="target">
-            <ref bean="setupRecordFolder"/>
-        </property>
-        <property name="interceptorNames">
-            <list>
-                <idref bean="setupRecordFolder_security"/>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="setupRecordFolder_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor" parent="actionSecurity">
-        <property name="objectDefinitionSource">
-            <value>
-                   org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.execute=RM_ALLOW
-                   org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementAction.*=RM_ALLOW
-                   org.alfresco.repo.action.executer.ActionExecuter.*=RM_ALLOW
-            </value>
-        </property>
-    </bean>
-    
-    <bean id="setupRecordFolder" class="org.alfresco.module.org_alfresco_module_rm.action.impl.SetupRecordFolderAction" parent="rmAction" />
-    
     <!-- declare record -->
     <!-- fileable?? -->
     

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

@@ -156,11 +156,12 @@
 
     <!--  Disposition Service -->
 
-    <bean id="dispositionService" class="org.alfresco.module.org_alfresco_module_rm.disposition.DispositionServiceImpl">
+    <bean id="dispositionService" class="org.alfresco.module.org_alfresco_module_rm.disposition.DispositionServiceImpl" init-method="init">
         <property name="recordsManagementServiceRegistry" ref="RecordsManagementServiceRegistry"/>
         <property name="nodeService" ref="NodeService"/>
         <property name="dictionaryService" ref="DictionaryService"/>
         <property name="behaviourFilter" ref="policyBehaviourFilter" />
+        <property name="policyComponent" ref="policyComponent" />
         <property name="dispositionSelectionStrategy">
            <ref local="org_alfresco_module_rm_dispositionSelectionStrategy" />
         </property>
@@ -966,21 +967,31 @@
             </value>
         </property>
     </bean>
+    
+    <!--  Record Folder Service -->
+    
+    <bean id="recordFolderService" class="org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordFolderServiceImpl" init-method="init">
+        <property name="nodeService" ref="NodeService"/>
+        <property name="policyComponent" ref="policyComponent" />
+        <property name="dispositionService" ref="DispositionService" />
+    </bean>
 
     <!--  Record Service -->
 
-    <bean id="recordService" class="org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImpl" init-method="init">
+    <bean id="recordService" class="org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordServiceImpl" init-method="init">
         <property name="nodeService" ref="NodeService"/>
         <property name="dictionaryService" ref="DictionaryService"/>
         <property name="identifierService" ref="recordsManagementIdentifierService"/>
         <property name="permissionService" ref="PermissionService"/>
         <property name="extendedSecurityService" ref="ExtendedSecurityService" />
         <property name="recordsManagementService" ref="RecordsManagementService" />
+        <property name="policyComponent" ref="policyComponent" />
+        <property name="dispositionService" ref="DispositionService" />
     </bean>
 
     <bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
         <property name="proxyInterfaces">
-            <value>org.alfresco.module.org_alfresco_module_rm.record.RecordService</value>
+            <value>org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordService</value>
         </property>
         <property name="target">
             <ref bean="recordService"/>
@@ -1018,14 +1029,13 @@
         <property name="objectDefinitionSource">
             <value>
                 <![CDATA[
-                org.alfresco.module.org_alfresco_module_rm.record.RecordService.getRecordMetaDataAspects=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.record.RecordService.isRecord=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.record.RecordService.isDeclared=RM.Read.0
-                org.alfresco.module.org_alfresco_module_rm.record.RecordService.isFiled=RM.Read.0
-                org.alfresco.module.org_alfresco_module_rm.record.RecordService.createRecord=RM_ALLOW
-                org.alfresco.module.org_alfresco_module_rm.record.RecordService.fileRecord=RM.WRITE.0.1
-                org.alfresco.module.org_alfresco_module_rm.record.RecordService.getUnfiledContainer=RM.Read.0
-                org.alfresco.module.org_alfresco_module_rm.record.RecordService.*=RM_DENY
+                org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordService.getRecordMetaDataAspects=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordService.isRecord=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordService.isDeclared=RM.Read.0
+                org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordService.isFiled=RM.Read.0
+                org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordService.createRecord=RM_ALLOW
+                org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordService.getUnfiledContainer=RM.Read.0
+                org.alfresco.module.org_alfresco_module_rm.disposableitem.RecordService.*=RM_DENY
                 ]]>
             </value>
         </property>