From e102e9ce4a4564fc5b7bb7bdacd90fb0d1dd2fcb Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Fri, 10 Sep 2010 11:58:15 +0000
Subject: [PATCH] Fixed ALF-4682: ActionTrackingService uses cluster-unsafe
 cache  - Added *full* replication of objects across the cluster for
 'executingActionsCache'  - Changed cache variables to use SimpleCache

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web/scripts/action/RunningActionRestApiTest.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java b/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java
index 756d39e718..5ce7efc6a1 100644
--- a/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/action/RunningActionRestApiTest.java
@@ -22,7 +22,7 @@ import javax.transaction.UserTransaction;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.ActionImpl;
-import org.alfresco.repo.cache.EhCacheAdapter;
+import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.model.Repository;
 import org.alfresco.repo.replication.ReplicationDefinitionImpl;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -45,10 +45,9 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.context.ApplicationContext;
 import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
 import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
 import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
-import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
-import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
 import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
 
 /**
@@ -70,7 +69,7 @@ public class RunningActionRestApiTest extends BaseWebScriptTest
     private ReplicationService replicationService;
     private TransactionService transactionService;
     private ActionTrackingService actionTrackingService;
-    private EhCacheAdapter<String, ExecutionDetails> executingActionsCache;
+    private SimpleCache<String, ExecutionDetails> executingActionsCache;
     
     private Repository repositoryHelper;
     private NodeRef dataDictionary;
@@ -968,7 +967,7 @@ public class RunningActionRestApiTest extends BaseWebScriptTest
         actionTrackingService = (ActionTrackingService)appContext.getBean("actionTrackingService");
         repositoryHelper = (Repository)appContext.getBean("repositoryHelper");
         transactionService = (TransactionService)appContext.getBean("transactionService");
-        executingActionsCache = (EhCacheAdapter<String, ExecutionDetails>)appContext.getBean("executingActionsSharedCache");
+        executingActionsCache = (SimpleCache<String, ExecutionDetails>)appContext.getBean("executingActionsCache");
         
         MutableAuthenticationService authenticationService = (MutableAuthenticationService)appContext.getBean("AuthenticationService");
         PersonService personService = (PersonService)appContext.getBean("PersonService");