From 0157dc4eb401f7fbff65ffa889925e8267016f53 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 2 Sep 2015 17:54:15 +0000
Subject: [PATCH] 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
---
 source/test-java/org/alfresco/opencmis/CMISTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/test-java/org/alfresco/opencmis/CMISTest.java b/source/test-java/org/alfresco/opencmis/CMISTest.java
index 10dc5e27af..c55a7d1a1e 100644
--- a/source/test-java/org/alfresco/opencmis/CMISTest.java
+++ b/source/test-java/org/alfresco/opencmis/CMISTest.java
@@ -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");