Merged V2.1 to HEAD

6958: Fix for WCM-823
   6959: Merged V1.4 to V2.1
      6943: Upgrade scripts for transaction commit time and indexes for QName columns on alf_child_assoc
   6960: Fixed script patch "applied on" date updates.
   6961: Retry transactions on ConstraintViolationException.
   6964: Added svn revision number to be substituted into build string if build number is not passed.
   6965: Daylight savings for FTP. Fix for AR-1776.
   6966: Added catch blocks for the AVMLockingException. WCM-877.
   6967: Interim fix for WCM-866 (large link validation report causes SQL exception)
   6968: Fixes for AWC-1309 "Broken preview image for Web Projects in MySpaces" and similar AWC-1635 "Broken/Missing images in MySpaces Web Script".
   6970: Force DB write ordering of the NodeStatus vs Node object.
   6971: More transaction demarcation fixes for special cases of non-executed script patches.
   6972: Switch off session size management for the mass archive and restore test.
   6973: Fixed AR-1801: Boolean isMultiValued() no longer returns null


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

source/java/org/alfresco/web/bean/wcm/LinkValidationState.java

@@ -60,6 +60,7 @@ public class LinkValidationState
    private String store;
    private String webapp;
    private boolean checkBeenReRun = false;
+   private boolean maxLinksReached = false;
    private Date checkCompletedAt;
    
    private int noFilesCheckedStart = -1;
@@ -82,6 +83,8 @@ public class LinkValidationState
    private int baseSnapshotVersion = 0;
    private int latestSnapshotVersion = 0;
    
+   private int maxNumberLinksInReport = -1;
+   
    private List<String> brokenStaticFilesStart;
    private List<String> brokenFormsStart;
    
@@ -237,7 +240,7 @@ public class LinkValidationState
     */
    public int getBaseSnapshotVersion()
    {
-      return baseSnapshotVersion;
+      return this.baseSnapshotVersion;
    }
 
    /**
@@ -245,7 +248,23 @@ public class LinkValidationState
     */
    public int getLatestSnapshotVersion()
    {
-      return latestSnapshotVersion;
+      return this.latestSnapshotVersion;
+   }
+   
+   /**
+    * @return The maximum number of links a report can have
+    */
+   public int getMaxNumberLinksInReport()
+   {
+      return this.maxNumberLinksInReport;
+   }
+   
+   /**
+    * @return true if the maximum number of links was exceeded in the last check
+    */
+   public boolean hasMaxNumberLinksExceeded()
+   {
+      return this.maxLinksReached;
    }
 
    /**
@@ -360,6 +379,11 @@ public class LinkValidationState
       // get the snapshot versions
       this.baseSnapshotVersion = report.getBaseSnapshotVersion();
       this.latestSnapshotVersion = report.getLatestSnapshotVersion();
+      
+      // get whether the max number of links was exceeded for the report
+      // and the maximum number of links allowed
+      this.maxLinksReached = report.hasMaxNumberLinksExceeded();
+      this.maxNumberLinksInReport = report.getMaxNumberLinksInReport();
          
       if (this.cause == null)
       {