Merged V2.1 to HEAD

6515: Fix for AWC-1362 (system error page when clicking on space that doesn't exist in navigator)
   6516: Fix for AR-1688 - Vista
   6518: Fix for AWC-1479, AWC-1199 and AWC-426 (javascript insertion into forum posts security related fixes) limit to subset of safe tags for posting
   6519: Fix AR-1690 Web Scripts url.args is missing even though it's documented in WIKI
   6520: Fix for AWC-1271 (component generator config ignored for associations)
   6521: Fix AWC-1492 Some included javascript files in template/webscripts use the wrong app context path i.e. /alfresco when the app is called /alfzip
   6522: Build fix
   6523: - Fix rendering of tasks with no description in office portlets
   6524: Added thread pool for index merging (AR-1633, AR-1579)
   6525: One more fix for rendering of tasks with no description in office portlets
   6527: Renamed axis jar to reflect version number.
   6528: WebServices query cache refactoring


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

source/java/org/alfresco/repo/webservice/Utils.java

@@ -79,6 +79,8 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
  */
 public class Utils
 {
+    /** Default batch size for query results - 1000 */
+    public static final int DEFAULT_BATCH_SIZE = 1000;
     public static final String REPOSITORY_SERVICE_NAMESPACE = "http://www.alfresco.org/ws/service/repository/1.0";
     
     /** Get the logger for this class */
@@ -384,8 +386,7 @@ public class Utils
                 }
 
                 NodeRef rootNodeRef = nodeService.getRootNode(convertToStoreRef(store));
-                List<NodeRef> nodes = searchService.selectNodes(rootNodeRef, path,
-                                null, namespaceService, false);
+                List<NodeRef> nodes = searchService.selectNodes(rootNodeRef, path, null, namespaceService, false);
 
                  // make sure we only have one result
                 if (nodes.size() != 1)
@@ -589,7 +590,7 @@ public class Utils
      */
     public static int getBatchSize(MessageContext msgContext)
     {
-        int batchSize = -1;
+        int batchSize = DEFAULT_BATCH_SIZE;
 
         Integer batchConfigSize = (Integer) MessageContext.getCurrentContext()
                 .getProperty(QueryConfigHandler.ALF_FETCH_SIZE);