From b740064f778d3deb38bf19b13d2dd900b7bc8647 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 18 Nov 2013 15:33:24 +0000
Subject: [PATCH] RM-1097: Fixed failing tests after Refactoring TransferAction
 and TransferCompleteAction

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@57964 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../module/org_alfresco_module_rm/rm-service-context.xml     | 5 ++++-
 .../disposition/DispositionServiceImpl.java                  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index fde1d70b91..b8bc79115e 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -179,7 +179,7 @@
     <!--  Disposition Service -->
     <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="nodeService" ref="nodeService"/>
         <property name="dictionaryService" ref="DictionaryService"/>
         <property name="behaviourFilter" ref="policyBehaviourFilter" />
         <property name="policyComponent" ref="policyComponent" />
@@ -264,6 +264,7 @@
         <property name="dispositionService" ref="DispositionService" />
         <property name="recordService" ref="RecordService" />
         <property name="recordFolderService" ref="RecordFolderService" />
+        <property name="nodeService" ref="nodeService"/>
     </bean>
 
     <bean id="RmTransferService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -307,6 +308,8 @@
             <value>
                 <![CDATA[
                 org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.isTransfer=RM.Read.0
+                org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.transfer=RM.Read.0
+                org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.complete=RM.Read.0
                 org.alfresco.module.org_alfresco_module_rm.transfer.TransferService.*=RM_DENY
                 ]]>
             </value>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
index 9a70807641..f2e8b668d4 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
@@ -275,7 +275,7 @@ public class DispositionServiceImpl implements
     {
         DispositionSchedule di = null;
         NodeRef diNodeRef = null;
-        if (serviceRegistry.getRecordService().isRecord(nodeRef) == true)
+        if (recordService.isRecord(nodeRef) == true)
         {
             // Get the record folders for the record
             List<NodeRef> recordFolders = recordFolderService.getRecordFolders(nodeRef);