Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


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

search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/AlfrescoClientDataModelServicesFactory.java

@@ -31,7 +31,8 @@ public class AlfrescoClientDataModelServicesFactory
     /**
      * Constructs a dictionary by default.
      * 
-     * @param cmisMapping
+     * @param qnameFilter
+     * @param namespaceDAO
      * @param dictionaryService
      * @param dictionaryDAO
      * @return Map<String,CMISDictionaryService> 

search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/client/SOLRAPIClient.java

@@ -207,7 +207,7 @@ public class SOLRAPIClient
     /**
      * Get the ACLs associated with a given list of ACL ChangeSets.  The ACLs may be truncated for
      * the last ACL ChangeSet in the return values - the ACL count from the
-     * {@link #getAclChangeSets(Long, Long, int) ACL ChangeSets}.
+     * {@link #getAclChangeSets(Long, Long, Long, Long, int) ACL ChangeSets}.
      * 
      * @param aclChangeSets                 the ACL ChangeSets to include
      * @param minAclId                      the lowest ACL ID (may be <tt>null</tt>)

search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/tracker/IndexHealthReport.java

@@ -97,7 +97,7 @@ public class IndexHealthReport
     }
 
     /**
-     * @param leafCount
+     * @param leafDocCountInIndex
      */
     public void setLeafDocCountInIndex(long leafDocCountInIndex)
     {
@@ -113,7 +113,7 @@ public class IndexHealthReport
     }
     
     /**
-     * @param auxCount
+     * @param auxDocCountInIndex
      */
     public void setAuxDocCountInIndex(long auxDocCountInIndex)
     {
@@ -172,7 +172,7 @@ public class IndexHealthReport
     }
 
     /**
-     * @param transactionDocsInIndex
+     * @param aclTransactionDocsInIndex
      *            the transactionDocsInIndex to set
      */
     public void setAclTransactionDocsInIndex(long aclTransactionDocsInIndex)
@@ -276,7 +276,7 @@ public class IndexHealthReport
     }
 
     /**
-     * @param lastIndexCommitTime
+     * @param lastIndexedCommitTime
      *            the lastIndexCommitTime to set
      */
     public void setLastIndexedCommitTime(long lastIndexedCommitTime)
@@ -302,7 +302,7 @@ public class IndexHealthReport
     }
 
     /**
-     * @param cardinality
+     * @param dbAclTransactionCount
      */
     public void setDbAclTransactionCount(long dbAclTransactionCount)
     {
@@ -358,7 +358,7 @@ public class IndexHealthReport
     }
 
     /**
-     * @param unindexedCount
+     * @param unindexedDocCountInIndex
      */
     public void setUnindexedDocCountInIndex(long unindexedDocCountInIndex)
     {
@@ -374,7 +374,7 @@ public class IndexHealthReport
     }
 
     /**
-     * @param errorCount
+     * @param errorDocCountInIndex
      */
     public void setErrorDocCountInIndex(long errorDocCountInIndex)
     {

search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/tracker/TrackerStats.java

@@ -70,7 +70,7 @@ public class TrackerStats
     }
 
     /**
-     * @param modelTimes2
+     * @param all
      * @return
      */
     private SimpleStats aggregateResults(ConcurrentHashMap<String, IncrementalStats> all)
@@ -767,7 +767,7 @@ public class TrackerStats
     }
 
     /**
-     * @param l
+     * @param time
      */
     public void addModelTime(long time)
     {
@@ -781,7 +781,7 @@ public class TrackerStats
     }
 
     /**
-     * @param l
+     * @param time
      */
     public void addAclTime(long time)
     {
@@ -795,7 +795,7 @@ public class TrackerStats
     }
 
     /**
-     * @param l
+     * @param time
      */
     public void addNodeTime(long time)
     {
@@ -810,7 +810,7 @@ public class TrackerStats
 
     /**
      * @param docCount
-     * @param l
+     * @param time
      */
     public void addElapsedNodeTime(int docCount, long time)
     {
@@ -834,7 +834,7 @@ public class TrackerStats
     
     /**
      * @param docCount
-     * @param l
+     * @param time
      */
     public void addElapsedAclTime(int docCount, long time)
     {
@@ -858,7 +858,7 @@ public class TrackerStats
     
     /**
      * @param docCount
-     * @param l
+     * @param time
      */
     public void addElapsedContentTime(int docCount, long time)
     {
@@ -909,7 +909,7 @@ public class TrackerStats
     }
 
     /**
-     * @param l
+     * @param time
      */
     public void addDocTransformationTime(long time)
     {