Merged V1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3987 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4133 .
   Removed LicenseComponent reference from projects\repository\source\java\org\alfresco\repo\descriptor\DescriptorServiceImpl.java


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

source/java/org/alfresco/web/config/ClientConfigElement.java

@@ -36,6 +36,7 @@ public class ClientConfigElement extends ConfigElementAdapter
    private int searchMinimum = 3;
    private boolean forceAndTerms = false;
    private int searchMaxResults = -1;
+   private int selectorsSearchMaxResults = 500;
    private String helpUrl = null;
    private String editLinkType = "http";
    private String homeSpacePermission = null;
@@ -135,6 +136,11 @@ public class ClientConfigElement extends ConfigElementAdapter
          combinedElement.setSearchMaxResults(newElement.getSearchMaxResults());
       }
       
+      if (newElement.getSelectorsSearchMaxResults() != combinedElement.getSelectorsSearchMaxResults())
+      {
+         combinedElement.setSelectorsSearchMaxResults(newElement.getSelectorsSearchMaxResults());
+      }
+      
       if (newElement.isShelfVisible() != combinedElement.isShelfVisible())
       {
          combinedElement.setShelfVisible(newElement.isShelfVisible());
@@ -310,10 +316,9 @@ public class ClientConfigElement extends ConfigElementAdapter
     * 
     * @return
     */
-   
    public int getSearchMaxResults()
    {
-       return searchMaxResults;
+       return this.searchMaxResults;
    }
 
    /**
@@ -326,6 +331,29 @@ public class ClientConfigElement extends ConfigElementAdapter
    {
        this.searchMaxResults = searchMaxResults;
    }
+   
+   /**
+    * If positive, this will limit the size of the result set from the search
+    * used in selector components.
+    * 
+    * @return The maximum number of results to display
+    */
+   public int getSelectorsSearchMaxResults()
+   {
+       return this.selectorsSearchMaxResults;
+   }
+
+   /**
+    * Set if the the result set from a search for the selector components
+    * will be of limited size. If negative it is unlimited, by default, 
+    * this is set to 500.
+    * 
+    * @param selectorsSearchMaxResults
+    */
+   /*package*/ void setSelectorsSearchMaxResults(int selectorsSearchMaxResults)
+   {
+       this.selectorsSearchMaxResults = selectorsSearchMaxResults;
+   }
 
    /**
     * @return Returns the default Home Space permissions.