Merged DEV to HEAD

52182: MT: Remove some unused code and add @Override for DAO methods
   52183: ALF-19172: Disable sys:undeletable aspect while deleting test's tenants
   52274: Allow post-test tenant deletion by implementing hacks against ALF-19155


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-07-09 13:45:58 +00:00
parent 437ba4e516
commit e4cd0465bb
4 changed files with 20 additions and 25 deletions

View File

@@ -43,7 +43,6 @@ import org.alfresco.repo.model.Repository;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.node.archive.RestoreNodeReport;
import org.alfresco.repo.node.index.FullIndexRecoveryComponent;
import org.alfresco.repo.node.index.IndexTransactionTracker;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
@@ -259,6 +258,7 @@ public class MultiTDemoTest extends TestCase
{
BehaviourFilter behaviourFilter = (BehaviourFilter) ctx.getBean("policyBehaviourFilter");
behaviourFilter.disableBehaviour(ContentModel.TYPE_PERSON);
behaviourFilter.disableBehaviour(ContentModel.ASPECT_UNDELETABLE);
}
tenantAdminService.deleteTenant(tenantDomain);