From 17c2f95a00e408b4be9e797d255566aa47d41d76 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Tue, 15 Mar 2016 11:50:42 +0000 Subject: [PATCH] Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 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 --- .../alfresco/update/tool/dircomp/FileTreeCompareImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/enterprise-update-test/src/main/java/org/alfresco/update/tool/dircomp/FileTreeCompareImpl.java b/enterprise-update-test/src/main/java/org/alfresco/update/tool/dircomp/FileTreeCompareImpl.java index 3959de78fa..d82a7b0a24 100644 --- a/enterprise-update-test/src/main/java/org/alfresco/update/tool/dircomp/FileTreeCompareImpl.java +++ b/enterprise-update-test/src/main/java/org/alfresco/update/tool/dircomp/FileTreeCompareImpl.java @@ -48,7 +48,7 @@ public class FileTreeCompareImpl implements FileTreeCompare { // This config MUST be present before any TFile objects etc. are created. 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.allowedDiffsPaths.addAll(allowedDiffsPath); } @@ -204,7 +204,8 @@ public class FileTreeCompareImpl implements FileTreeCompare private boolean isSpecialArchive(Path pathToFind) { 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"); } /**