Merged 5.2.N (5.2.1) to HEAD (5.2)

128985 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128984 amorarasu: MNT-16469: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         128478 amorarasu: MNT-16468: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            128228, 128380 amorarasu: MNT-16439: Merged V4.2.4 (4.2.4.23) to V4.2-BUG-FIX (4.2.7)
               128107 amorarasu: MNT-16040: skipCount does not appear to work for Workflow tasks REST api
            - Updated Activiti to version 5.19.0.3


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/workflow/api/impl/TasksImpl.java

@@ -138,6 +138,7 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
     private MessageService messageService;
     private PersonService personService;
     private ActivitiPropertyConverter propertyConverter;
+    private int taskVariablesLimit = 20000;
     
     public void setPropertyConverter(ActivitiPropertyConverter propertyConverter)
     {
@@ -159,6 +160,16 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
         this.personService = personService;
     }
     
+    public int getTaskVariablesLimit()
+    {
+        return taskVariablesLimit;
+    }
+    
+    public void setTaskVariablesLimit(int taskVariablesLimit)
+    {
+        this.taskVariablesLimit = taskVariablesLimit;
+    }
+    
     @Override
     public CollectionWithPagingInfo<Task> getTasks(Parameters parameters)
     {
@@ -293,6 +304,9 @@ public class TasksImpl extends WorkflowRestImpl implements Tasks
                 query.includeTaskLocalVariables();
             }
             
+            // use the limit set in alfresco-global.properties
+            query.limitTaskVariables(taskVariablesLimit);
+            
             List<QueryVariableHolder> variableProperties = propertyWalker.getVariableProperties();
             setQueryUsingVariables(query, variableProperties);