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

config/alfresco/messages/webclient.properties

@@ -1242,6 +1242,7 @@ generated_tab={0} Generated Files
 all_items_tab=All Items
 inc_tab_size=Increases the size of the scrollable area by 100px
 dec_tab_size=Decreases the size of the scrollable area by 100px (to a minimum of 100px)
+failed_to_find_validation_report=Failed to find the link validation report, this is probably due to the report being too large, please lower the 'maxNumberLinksInReport' setting.
 
 prompt_for_web_form=Select Web Form
 prompt_for_web_form_info=Select the Web Form to use for editing this file

config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl

@@ -123,6 +123,7 @@ a.spacefilterLink:link, a.spacefilterLink:visited
    font-size: 12px;
    font-weight: bold;
    text-decoration: none;
+   outline: none;
    padding-left: 4px;
    padding-right: 4px;
 }
@@ -531,6 +532,7 @@ a.refreshViewLink:link, a.refreshViewLink:visited, a.refreshViewLink:hover
    font-size: 12px;
    color: #515D6B;
    text-decoration: none;
+   outline: none;
 }
 
 .spacePreview

config/alfresco/templates/webscripts/org/alfresco/portlets/myspacespanel.get.html.ftl

@@ -3,6 +3,8 @@
 <#assign weekms=1000*60*60*24*7>
 <#list companyhome.nodeByReference[args.h].children?sort_by('name') as d>
    <#if (d.isContainer || d.isDocument) &&
+   			(d.type != "{http://www.alfresco.org/model/forum/1.0}forums") &&
+   			(d.type != "{http://www.alfresco.org/model/wcmappmodel/1.0}webfolder") &&
         ((args.f="0") ||
          (args.f="1" && d.isContainer) ||
          (args.f="2" && d.isDocument) ||

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;
    }
 
    /**
@@ -361,6 +380,11 @@ public class LinkValidationState
       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)
       {
          if (updatedReport == false)

source/java/org/alfresco/web/ui/wcm/component/UILinkValidationReport.java

@@ -119,6 +119,8 @@ public class UILinkValidationReport extends AbstractLinkValidationReportComponen
       if (logger.isDebugEnabled())
          logger.debug("Rendering report from state object: " + linkState);
       
+      if (linkState != null)
+      {
          if (linkState.getError() == null && linkState.getNumberBrokenLinks() > 0)
          {
             // determine whether the generated files and broken links sections
@@ -325,6 +327,11 @@ public class UILinkValidationReport extends AbstractLinkValidationReportComponen
             out.write("<div>&nbsp;</div>");
          }
       }
+      else
+      {
+         out.write("<div>&nbsp;</div>");
+      }
+   }
    
    // ------------------------------------------------------------------------------
    // Strongly typed component property accessors

source/java/org/alfresco/web/ui/wcm/component/UILinkValidationSummary.java

@@ -115,6 +115,8 @@ public class UILinkValidationSummary extends AbstractLinkValidationReportCompone
          out.write("</div>");
       }
       
+      if (linkState != null)
+      {
          if (linkState.getError() == null)
          {
             // render the main summary info
@@ -151,9 +153,15 @@ public class UILinkValidationSummary extends AbstractLinkValidationReportCompone
                                    linkState.getNumberLinksChecked()});
             
             pattern = bundle.getString("link_check_items_broken");
+            
+            String numBrokenLinks = Integer.toString(linkState.getNumberBrokenLinks());
+            if (linkState.hasMaxNumberLinksExceeded())
+            {
+               numBrokenLinks = Integer.toString(linkState.getMaxNumberLinksInReport()) + "+";
+            }
+            
             String brokenSummary = MessageFormat.format(pattern, 
-                  new Object[] {linkState.getNumberBrokenLinks(),
+                     new Object[] {numBrokenLinks, linkState.getNumberBrokenFiles()});
-                                linkState.getNumberBrokenFiles()});
             
             out.write("</div><div class='linkValSummaryText'>");
             out.write(checkedSummary);
@@ -194,6 +202,14 @@ public class UILinkValidationSummary extends AbstractLinkValidationReportCompone
             }
             out.write("</span>");
          }
+      }
+      else
+      {
+         // if the report was not found at all, show an error to that effect
+         out.write("<span class='errorMessage'>");
+         out.write(bundle.getString("failed_to_find_validation_report"));
+         out.write("</span>");
+      }
       
       out.write("</div>");