mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.1 to HEAD
6408: removing the avmsubmittedaspect 6409: reintroducing the avmclearsubmittedhandler as a stub in order to keep inflight workflows operating properly. 6412: Fix to a subtle navigation issue when browsing WCM projects. 6415: WCM-678 - Page size WCM browse screens 6417: Fixes WCM-556, WCM-557, WCM-618 & WCM-620 Line endings change -- manual merge Manual 'root\projects\web-client\config\alfresco\messages\webclient.properties' git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -158,47 +158,21 @@ public class LinkValidationAction extends ActionExecuterAbstractBase
|
||||
// get the broken files created due to deletions and new/modified files
|
||||
HrefManifest manifest = this.linkValidationService.getBrokenHrefManifest(hdiff);
|
||||
|
||||
// TODO: use the counts retrieved from the manifest object and pass them
|
||||
// into the constructor, the report object can then store these for
|
||||
// later retrieval.
|
||||
|
||||
// int baseVersion = manifest.getBaseSnapshotVersion();
|
||||
// int latestVersion = manifest.getLatestSnapshotVersion();
|
||||
// int fileCount = manifest.getBaseFileCount();
|
||||
// int linkCount = manifest.getBaseLinkCount();
|
||||
|
||||
HrefManifest bogus = new HrefManifest();
|
||||
|
||||
// TODO: change the constructor to just take one manifest object
|
||||
|
||||
// create the report object using the 2 sets of results
|
||||
report = new LinkValidationReport(storeName, webappName, monitor, manifest, bogus);
|
||||
report = new LinkValidationReport(storeName, webappName, manifest,
|
||||
monitor.getFileUpdateCount(), monitor.getUrlUpdateCount());
|
||||
}
|
||||
else
|
||||
{
|
||||
// retrieve the manifest of all the broken links and files for the webapp
|
||||
HrefManifest manifest = this.linkValidationService.getBrokenHrefManifest(webappPath);
|
||||
|
||||
List<HrefManifestEntry> manifests =
|
||||
manifest.getManifestEntries();
|
||||
|
||||
// TODO: use the counts retrieved from the manifest object and pass them
|
||||
// into the constructor, the report object can then store these for
|
||||
// later retrieval to show how far 'bejind' the report is.
|
||||
// NOTE: that latestVersion >= baseVersion
|
||||
// Whenever latestVersion > baseVersion,
|
||||
// link validation is "behind".
|
||||
|
||||
// int baseVersion = manifest.getBaseSnapshotVersion();
|
||||
// int latestVersion = manifest.getLatestSnapshotVersion();
|
||||
// int fileCount = manifest.getBaseFileCount();
|
||||
// int linkCount = manifest.getBaseLinkCount();
|
||||
|
||||
// Create the report object using the link check results
|
||||
report = new LinkValidationReport(storeName, webappName, monitor, manifests);
|
||||
report = new LinkValidationReport(storeName, webappName, manifest,
|
||||
manifest.getBaseFileCount(), manifest.getBaseLinkCount());
|
||||
|
||||
// the monitor object is not used anymore so manually set
|
||||
// the done status so the client ca retrieve the report.
|
||||
// the monitor object is not used here so manually set
|
||||
// the done status so the client can retrieve the report.
|
||||
monitor.setDone( true );
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user