inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)

Browse Source 
122745 mward: UTF-383: added support for deep differencing in amp files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2016-03-15 11:50:42 +00:00
parent 536e7d884d
commit 17c2f95a00
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
enterprise-update-test/src/main/java/org/alfresco/update/tool/dircomp/FileTreeCompareImpl.java
View File

@@ -48,7 +48,7 @@ public class FileTreeCompareImpl implements FileTreeCompare
{ {
// This config MUST be present before any TFile objects etc. are created. // This config MUST be present before any TFile objects etc. are created.
TConfig config = TConfig.get(); TConfig config = TConfig.get();
config.setArchiveDetector(new TArchiveDetector("war|jar", new ZipDriver(IOPoolLocator.SINGLETON))); config.setArchiveDetector(new TArchiveDetector("war|jar|amp", new ZipDriver(IOPoolLocator.SINGLETON)));
this.ignorePaths.addAll(ignorePaths); this.ignorePaths.addAll(ignorePaths);
this.allowedDiffsPaths.addAll(allowedDiffsPath); this.allowedDiffsPaths.addAll(allowedDiffsPath);
} }
@@ -204,7 +204,8 @@ public class FileTreeCompareImpl implements FileTreeCompare
private boolean isSpecialArchive(Path pathToFind) private boolean isSpecialArchive(Path pathToFind)
{ {
return pathToFind.getFileName().toString().toLowerCase().endsWith(".war") || return pathToFind.getFileName().toString().toLowerCase().endsWith(".war") ||
pathToFind.getFileName().toString().toLowerCase().endsWith(".jar"); pathToFind.getFileName().toString().toLowerCase().endsWith(".jar") ||
pathToFind.getFileName().toString().toLowerCase().endsWith(".amp");
} }
/** /**