Merged V2.2 to HEAD

8514: Updated clusterd cach example - ACL changes, attributes, AVM and minor fix ups
   8522: Fix for AR-1694
   8587: Merged V2.1 to V2.2
      8575: Fix for AR-2166 "Display of tasks in MyAlfresco dashboard broken when using oracle"
   8617: AVMTestRemote - fix test/data
   8632: Merged V2.1 to V2.2
      8623: Fixed AR-2122: Code re-entry paths through transaction resource interceptor cause data loss
      8624: Fixed test associated with session resource management fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-19 16:09:48 +00:00
parent a20061ccf1
commit cecd138ed6
13 changed files with 882 additions and 89 deletions

View File

@@ -29,7 +29,7 @@ import java.lang.reflect.Method;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.node.BaseNodeServiceTest;
import org.alfresco.repo.node.db.DbNodeServiceImpl;
import org.alfresco.repo.transaction.TransactionResourceInterceptor;
import org.alfresco.repo.transaction.SingleEntryTransactionResourceInterceptor;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
@@ -45,7 +45,7 @@ import org.alfresco.service.namespace.QName;
*/
public class SessionSizeManagementTest extends BaseNodeServiceTest
{
private TransactionResourceInterceptor interceptor;
private SingleEntryTransactionResourceInterceptor interceptor;
private Method createNodesMethod;
public SessionSizeManagementTest()
@@ -85,7 +85,7 @@ public class SessionSizeManagementTest extends BaseNodeServiceTest
{
super.onSetUpInTransaction();
// Get the interceptor for manual testing
interceptor = (TransactionResourceInterceptor) applicationContext.getBean("testSessionSizeResourceInterceptor");
interceptor = (SingleEntryTransactionResourceInterceptor) applicationContext.getBean("testSessionSizeResourceInterceptor");
}
/** Helper to create a given number of nodes using the provided service */