mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V4.1-BUG-FIX to HEAD
47745: ALF-18302: Merged V4.0.2 (4.0.2.29) to V4.1-BUG-FIX (4.1.5) 47498: MNT-317: CIFS: Image document version history lost intermittently after saving content in Preview on Mac Mountain Lion - Candidate fix by Dmitry Vaserin 47753: ALF-12264: Domain-filtering also done with new approach of fetching WorklfowTasks 47778: Merged DEV to V4.1-BUG-FIX ALF-18151: CMIS cannot delete folders that have rules applied - Will throw 'CMISConstraintException' exception only if 'ContentModel.ASSOC_CONTAINS' child association exist for the folder what is deleted. - Added and succesfully executed two unit test for openCMIS and CMIS. 47794: ALF-18302: Merged DEV to V4.1-BUG-FIX 47631: MNT-317: CIFS: Image document version history lost intermittently after saving content in Preview on Mac Mountain Lion Add class description describing the shuffle on ScenarioRenameDeleteMove. Add proper unit test. 47795: Merged back build fix from HEAD (thanks Neil) 47803: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX 47680: Merged DEV to PATCHES/V4.1.4 47677: ALF-18270 Cannot open properties of model In FormUIGet.processFieldConstraints() was added check: (fieldConfig != null && fieldConfig.getConstraintDefinitionMap() != null). 47738: ALF-18301: Alfresco fails to start up because of NPE error, when debug logging for 'org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache' is enabled - Fix by Dmitry Velichkevich 47754: Merged DEV to PATCHES/V4.1.4 47751: ALF-17644 : Document version was increased after canceling editing. Unnecessary calls for property deletion was removed. 47767: ALF-18088: Add Implementation-Edition + limit Specification-Version to 3 digits in war MANIFEST files 47786: Fixed ALF-18137 "It's impossible to create a new item in the data list." 47804: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX (RECORD ONLY) 47755: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 47753: ALF-12264: Domain-filtering also done with new approach of fetching WorklfowTasks git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -32,17 +32,20 @@ import org.alfresco.cmis.CMISRenditionService;
|
||||
import org.alfresco.cmis.CMISServices;
|
||||
import org.alfresco.repo.dictionary.DictionaryDAO;
|
||||
import org.alfresco.repo.dictionary.NamespaceDAOImpl;
|
||||
import org.alfresco.repo.model.Repository;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationComponent;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
|
||||
import org.alfresco.repo.security.permissions.impl.ModelDAO;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.action.ActionService;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.repository.ContentService;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.service.cmr.rule.RuleService;
|
||||
import org.alfresco.service.cmr.search.SearchService;
|
||||
import org.alfresco.service.cmr.security.MutableAuthenticationService;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
@@ -58,61 +61,39 @@ import org.springframework.context.ApplicationContext;
|
||||
* Basic TX control and authentication
|
||||
*
|
||||
* @author andyh
|
||||
*
|
||||
*/
|
||||
public abstract class BaseCMISTest extends TestCase
|
||||
{
|
||||
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
|
||||
|
||||
protected CMISMapping cmisMapping;
|
||||
|
||||
protected CMISServices cmisService;
|
||||
|
||||
protected CMISDictionaryService cmisDictionaryService;
|
||||
|
||||
protected CMISRenditionService cmisRenditionService;
|
||||
|
||||
protected CMISAccessControlService cmisAccessControlService;
|
||||
|
||||
protected DictionaryService dictionaryService;
|
||||
|
||||
protected TransactionService transactionService;
|
||||
|
||||
protected AuthenticationComponent authenticationComponent;
|
||||
|
||||
protected UserTransaction testTX;
|
||||
|
||||
protected NodeService nodeService;
|
||||
|
||||
protected NodeRef rootNodeRef;
|
||||
|
||||
protected FileFolderService fileFolderService;
|
||||
|
||||
protected ServiceRegistry serviceRegistry;
|
||||
|
||||
protected NamespaceService namespaceService;
|
||||
|
||||
protected CMISQueryService cmisQueryService;
|
||||
|
||||
private MutableAuthenticationService authenticationService;
|
||||
|
||||
private MutableAuthenticationDao authenticationDAO;
|
||||
|
||||
protected SearchService searchService;
|
||||
|
||||
protected ContentService contentService;
|
||||
|
||||
protected PermissionService permissionService;
|
||||
|
||||
protected ThumbnailService thumbnailService;
|
||||
|
||||
protected ModelDAO permissionModelDao;
|
||||
|
||||
protected DictionaryDAO dictionaryDAO;
|
||||
|
||||
protected NamespaceDAOImpl namespaceDao;
|
||||
|
||||
protected VersionService versionService;
|
||||
protected ActionService actionService;
|
||||
protected RuleService ruleService;
|
||||
protected Repository repositoryHelper;
|
||||
|
||||
public void setUp() throws Exception
|
||||
{
|
||||
@@ -140,6 +121,11 @@ public abstract class BaseCMISTest extends TestCase
|
||||
|
||||
versionService = (VersionService) ctx.getBean("versionService");
|
||||
|
||||
actionService = (ActionService)ctx.getBean("actionService");
|
||||
ruleService = (RuleService)ctx.getBean("ruleService");
|
||||
|
||||
repositoryHelper = (Repository)ctx.getBean("repositoryHelper");
|
||||
|
||||
authenticationService = (MutableAuthenticationService) ctx.getBean("authenticationService");
|
||||
authenticationDAO = (MutableAuthenticationDao) ctx.getBean("authenticationDao");
|
||||
|
||||
|
Reference in New Issue
Block a user