mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Merged 5.0.N (5.0.3) to HEAD (5.1)
111285: Fix Build error from merge of Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) 111099: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6) 110999: Merged DEV to V4.2.5 (4.2.5) MNT-10537 : BPM Models are filtered for CMIS getTypeDefinition - As for DictionaryModelType we should destroy dictionary when new model is deployed from classpath. - Unit test added. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -174,7 +174,7 @@ public class CMISTest
|
||||
private AuthorityService authorityService;
|
||||
private AuditModelRegistryImpl auditSubsystem;
|
||||
private PermissionService permissionService;
|
||||
private DictionaryDAO dictionaryDAO;
|
||||
private DictionaryDAO dictionaryDAO;
|
||||
private CMISDictionaryService cmisDictionaryService;
|
||||
private AuditDAO auditDAO;
|
||||
private ActionService actionService;
|
||||
@@ -184,7 +184,6 @@ public class CMISTest
|
||||
private WorkflowService workflowService;
|
||||
private WorkflowAdminService workflowAdminService;
|
||||
private AuthenticationContext authenticationContext;
|
||||
private DictionaryDAO dictionaryDAO;
|
||||
private TenantAdminService tenantAdminService;
|
||||
private TenantService tenantService;
|
||||
private SearchService searchService;
|
||||
@@ -364,7 +363,6 @@ public class CMISTest
|
||||
this.workflowService = (WorkflowService) ctx.getBean("WorkflowService");
|
||||
this.workflowAdminService = (WorkflowAdminService) ctx.getBean("workflowAdminService");
|
||||
this.authenticationContext = (AuthenticationContext) ctx.getBean("authenticationContext");
|
||||
this.dictionaryDAO = (DictionaryDAO) ctx.getBean("dictionaryDAO");
|
||||
this.tenantAdminService = (TenantAdminService) ctx.getBean("tenantAdminService");
|
||||
this.tenantService = (TenantService) ctx.getBean("tenantService");
|
||||
this.searchService = (SearchService) ctx.getBean("SearchService");
|
||||
|
Reference in New Issue
Block a user